lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-03-16 23:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into documentation

Browse source
This commit is contained in:
fjosw 2022-01-24 13:24:32 +00:00
commit df0e84a0b2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pyerrors/fits.py
View file

@ -198,9 +198,9 @@ def total_least_squares(x, y, func, silent=False, **kwargs):
n_parms = i n_parms = i
if not silent: if not silent:
print('Fit with', n_parms, 'parameters') print('Fit with', n_parms, 'parameter' + 's' * (n_parms > 1))
if(len(const_par) > 0): if(len(const_par) > 0):
print('\t and %d constrained parameter%s' % (len(const_par), 's' if len(const_par) > 1 else ''), const_par) print('and %d constrained parameter%s' % (len(const_par), 's' if len(const_par) > 1 else ''), const_par)
x_f = np.vectorize(lambda o: o.value)(x) x_f = np.vectorize(lambda o: o.value)(x)
dx_f = np.vectorize(lambda o: o.dvalue)(x) dx_f = np.vectorize(lambda o: o.dvalue)(x)
@ -362,7 +362,7 @@ def _prior_fit(x, y, func, priors, silent=False, **kwargs):
output.priors = loc_priors output.priors = loc_priors
if not silent: if not silent:
print('Fit with', n_parms, 'parameters') print('Fit with', n_parms, 'parameter' + 's' * (n_parms > 1))
y_f = [o.value for o in y] y_f = [o.value for o in y]
dy_f = [o.dvalue for o in y] dy_f = [o.dvalue for o in y]
@ -482,9 +482,9 @@ def _standard_fit(x, y, func, silent=False, **kwargs):
n_parms = i n_parms = i
if not silent: if not silent:
print('Fit with', n_parms, 'parameters') print('Fit with', n_parms, 'parameter' + 's' * (n_parms > 1))
if(len(const_par) > 0): if(len(const_par) > 0):
print('\t and %d constrained parameter%s' % (len(const_par), 's' if len(const_par) > 1 else ''), const_par) print('and %d constrained parameter%s' % (len(const_par), 's' if len(const_par) > 1 else ''), const_par)
y_f = [o.value for o in y] y_f = [o.value for o in y]
dy_f = [o.dvalue for o in y] dy_f = [o.dvalue for o in y]