Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

e0f1f873 · Theo Steininger · 39e7ec15 · e1843d4d · e0f1f873
Commit e0f1f873 authored Aug 18, 2017 by Theo Steininger
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

nifty/minimization/line_searching/line_search_strong_wolfe.py ...y/minimization/line_searching/line_search_strong_wolfe.py +1 -1

No files found.
--- a/nifty/minimization/line_searching/line_search_strong_wolfe.py
+++ b/nifty/minimization/line_searching/line_search_strong_wolfe.py
@@ -116,7 +116,7 @@ class LineSearchStrongWolfe(LineSearch):

        if self.preferred_initial_step_size is not None:
            alpha1 = self.preferred_initial_step_size
-        elif old_phi_0 is not None and phiprime_0 != 0:
+        elif old_phi_0 is not None:
            alpha1 = min(1.0, 1.01*2*(phi_0 - old_phi_0)/phiprime_0)
            if alpha1 < 0:
                alpha1 = 1.0