Commit 446692d3 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

fix

parent 4ebe2364
Pipeline #26198 canceled with stages
in 6 minutes and 49 seconds
......@@ -99,7 +99,7 @@ def NewtonCG(xtol, maxiter, disp=False):
--------
ScipyMinimizer
"""
options = {"xtol": xtol, "maxiter": maxiter, "disp": verbose}
options = {"xtol": xtol, "maxiter": maxiter, "disp": disp}
return ScipyMinimizer("Newton-CG", options, True, None)
......@@ -111,5 +111,5 @@ def L_BFGS_B(ftol, gtol, maxiter, maxcor=10, disp=False, bounds=None):
ScipyMinimizer
"""
options = {"ftol": ftol, "gtol": gtol, "maxiter": maxiter,
"maxcor": maxcor, "disp": verbose}
"maxcor": maxcor, "disp": disp}
return ScipyMinimizer("L-BFGS-B", options, False, bounds)
......@@ -33,8 +33,8 @@ minimizers = ['ift.VL_BFGS(IC)',
#'ift.NonlinearCG(IC, "Hestenes-Stiefel"),
'ift.NonlinearCG(IC, "Fletcher-Reeves")',
'ift.NonlinearCG(IC, "5.49")',
'ift.NewtonCG(xtol=1e-5,maxiter=1000)',
'ift.L_BFGS_B(ftol=1e-10,gtol=1e-5,maxiter=1000)',
'ift.NewtonCG(xtol=1e-5, maxiter=1000)',
'ift.L_BFGS_B(ftol=1e-10, gtol=1e-5, maxiter=1000)',
'ift.L_BFGS(IC)']
newton_minimizers = ['ift.RelaxedNewton(IC)']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment