From de302551536ecfcc2d0ad29f17521292fd734e96 Mon Sep 17 00:00:00 2001 From: fjosw Date: Wed, 2 Feb 2022 09:50:25 +0000 Subject: [PATCH] Documentation updated --- docs/pyerrors/fits.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/pyerrors/fits.html b/docs/pyerrors/fits.html index b075b73c..08961c2a 100644 --- a/docs/pyerrors/fits.html +++ b/docs/pyerrors/fits.html @@ -600,20 +600,21 @@ chisq = anp.sum(((y_f - model) / dy_f) ** 2) return chisq - if 'method' in kwargs: + if 'method' in kwargs and not (kwargs.get('method', 'Levenberg-Marquardt') == 'Levenberg-Marquardt'): output.method = kwargs.get('method') if not silent: print('Method:', kwargs.get('method')) if kwargs.get('method') == 'migrad': fit_result = iminuit.minimize(chisqfunc, x0) fit_result = iminuit.minimize(chisqfunc, fit_result.x) + output.iterations = fit_result.nfev else: fit_result = scipy.optimize.minimize(chisqfunc, x0, method=kwargs.get('method')) fit_result = scipy.optimize.minimize(chisqfunc, fit_result.x, method=kwargs.get('method'), tol=1e-12) + output.iterations = fit_result.nit chisquare = fit_result.fun - output.iterations = fit_result.nit else: output.method = 'Levenberg-Marquardt' if not silent: