make final fit parameter values
This commit is contained in:
parent
067857eda2
commit
6ecc4a4126
@ -186,7 +186,6 @@ class Parameter:
|
||||
|
||||
@property
|
||||
def value(self) -> float | None:
|
||||
# TODO first _value, then _expr
|
||||
if self._value is not None:
|
||||
return self._value
|
||||
|
||||
@ -239,3 +238,7 @@ class Parameter:
|
||||
|
||||
return para_copy
|
||||
|
||||
def fix(self):
|
||||
self._value = self.value
|
||||
self.namespace = {}
|
||||
|
||||
|
@ -187,7 +187,7 @@ class FitResult(Points):
|
||||
nice_name = m.group(1)
|
||||
if func_number in split_funcs:
|
||||
nice_func = split_funcs[func_number]
|
||||
|
||||
pvalue.fix()
|
||||
pvalue.name = nice_name
|
||||
pvalue.function = nice_func
|
||||
parameter_dic[pname] = pvalue
|
||||
@ -196,6 +196,8 @@ class FitResult(Points):
|
||||
if modelname[0] == '(' and modelname[-1] == ')':
|
||||
modelname = modelname[1:-1]
|
||||
|
||||
print(parameter_dic)
|
||||
|
||||
return parameter_dic, modelname
|
||||
|
||||
@property
|
||||
@ -233,9 +235,9 @@ class FitResult(Points):
|
||||
s.write(self.parameter_string())
|
||||
|
||||
if statistics:
|
||||
s.write('Statistics\n')
|
||||
s.write('\nStatistics\n')
|
||||
for k, v in self.statistics.items():
|
||||
s.write(f' {k} : {v:.4f}')
|
||||
s.write(f' {k} : {v:.4f}\n')
|
||||
|
||||
if correlations and self.correlation is not None:
|
||||
s.write('\nCorrelation (partial corr.)\n')
|
||||
|
Loading…
Reference in New Issue
Block a user