diff --git a/nifty/minimization/line_searching/line_search.py b/nifty/minimization/line_searching/line_search.py index 9456b9acca50ff6dc8d3a3f7fe6dda1ffb397150..419569560658f3edf3b3c7b3fbfc4691a9282dde 100644 --- a/nifty/minimization/line_searching/line_search.py +++ b/nifty/minimization/line_searching/line_search.py @@ -44,9 +44,6 @@ class LineSearch(Loggable, object): __metaclass__ = abc.ABCMeta def __init__(self): - - - self.line_energy = None self.f_k_minus_1 = None self.preferred_initial_step_size = None diff --git a/nifty/minimization/line_searching/line_search_strong_wolfe.py b/nifty/minimization/line_searching/line_search_strong_wolfe.py index bf0eeb8c1c6e484d550eb9d6a9b538582b6d9526..46010bd3e88c9ba713759f8d348f876e77e6e947 100644 --- a/nifty/minimization/line_searching/line_search_strong_wolfe.py +++ b/nifty/minimization/line_searching/line_search_strong_wolfe.py @@ -175,7 +175,6 @@ class LineSearchStrongWolfe(LineSearch): break phi_alpha0 = phi_alpha1 phiprime_alpha0 = phiprime_alpha1 - # phi_alpha1 = self._phi(alpha1) else: # max_iterations was reached @@ -201,9 +200,10 @@ class LineSearchStrongWolfe(LineSearch): Parameters ---------- alpha_lo : float - The lower boundary for the step length interval. + A boundary for the step length interval. + Fulfills Wolfe condition 1. alpha_hi : float - The upper boundary for the step length interval. + The other boundary for the step length interval. phi_0 : float Value of the energy at the starting point of the line search algorithm.