Skip to content
Snippets Groups Projects
Commit 3150ff53 authored by Theo Steininger's avatar Theo Steininger
Browse files

Bug fixes.

parent 95df1f22
No related branches found
No related tags found
1 merge request!97Now descent minimizer and bugfix
Pipeline #
Hide whitespace changes
Inline Side-by-side
nifty/minimization/__init__.py
+ 1
− 1
View file @ 3150ff53
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
from line_searching import * from line_searching import *
from conjugate_gradient import ConjugateGradient from conjugate_gradient import ConjugateGradient
from descent_minimizer import QuasiNewtonMinimizer from descent_minimizer import DescentMinimizer
from steepest_descent import SteepestDescent from steepest_descent import SteepestDescent
from vl_bfgs import VL_BFGS from vl_bfgs import VL_BFGS
from relaxed_newton import RelaxedNewton from relaxed_newton import RelaxedNewton
nifty/minimization/line_searching/line_search_strong_wolfe.py
+ 2
− 2
View file @ 3150ff53
...@@ -148,8 +148,8 @@ class LineSearchStrongWolfe(LineSearch): ...@@ -148,8 +148,8 @@ class LineSearchStrongWolfe(LineSearch):
# extract the full energy from the line_energy # extract the full energy from the line_energy
energy_star = energy_star.energy energy_star = energy_star.energy
length_direction = pk.norm direction_length = pk.norm()
step_length = alpha_star * length_direction step_length = alpha_star * direction_length
return step_length, phi_star, energy_star return step_length, phi_star, energy_star
def _zoom(self, alpha_lo, alpha_hi, phi_0, phiprime_0, def _zoom(self, alpha_lo, alpha_hi, phi_0, phiprime_0,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment