Merge branch 'master' into python3

a476b875 · Martin Reinecke · f81ce5cf · da29a8f4 · a476b875
Commit a476b875 authored Aug 22, 2017 by Martin Reinecke
--- a/nifty/minimization/line_searching/line_search_strong_wolfe.py
+++ b/nifty/minimization/line_searching/line_search_strong_wolfe.py
@@ -124,7 +124,7 @@ class LineSearchStrongWolfe(LineSearch):
            if alpha1 < 0:
                alpha1 = 1.0
        else:
-            alpha1 = 1.0
+            alpha1 = 1.0/pk.norm()

        # start the minimization loop
        for i in range(self.max_iterations):