diff --git a/nifty/minimization/__init__.py b/nifty/minimization/__init__.py index bcb5964029f2b889835e0f2001fdfb53f2a49e59..83001f4911b1c9564d21cdb8a56860278ca7bc33 100644 --- a/nifty/minimization/__init__.py +++ b/nifty/minimization/__init__.py @@ -18,7 +18,7 @@ from line_searching import * from conjugate_gradient import ConjugateGradient -from descent_minimizer import QuasiNewtonMinimizer +from descent_minimizer import DescentMinimizer from steepest_descent import SteepestDescent from vl_bfgs import VL_BFGS from relaxed_newton import RelaxedNewton diff --git a/nifty/minimization/line_searching/line_search_strong_wolfe.py b/nifty/minimization/line_searching/line_search_strong_wolfe.py index 084775eedd038357ef9bbdd9044bc9ac243ee1d8..e6b94969003848a687e1d0191de106b829e8c80d 100644 --- a/nifty/minimization/line_searching/line_search_strong_wolfe.py +++ b/nifty/minimization/line_searching/line_search_strong_wolfe.py @@ -148,8 +148,8 @@ class LineSearchStrongWolfe(LineSearch): # extract the full energy from the line_energy energy_star = energy_star.energy - length_direction = pk.norm - step_length = alpha_star * length_direction + direction_length = pk.norm() + step_length = alpha_star * direction_length return step_length, phi_star, energy_star def _zoom(self, alpha_lo, alpha_hi, phi_0, phiprime_0,