-
Theo Steininger authored
# Conflicts: # nifty/minimization/conjugate_gradient.py # nifty/minimization/descent_minimizer.py # nifty/minimization/relaxed_newton.py # nifty/minimization/steepest_descent.py # nifty/minimization/vl_bfgs.py
e4bfff38
# Conflicts: # nifty/minimization/conjugate_gradient.py # nifty/minimization/descent_minimizer.py # nifty/minimization/relaxed_newton.py # nifty/minimization/steepest_descent.py # nifty/minimization/vl_bfgs.py