dominik/nmreval
1
0
Fork 0
forked from IPKM/nmreval
Code Pull Requests Activity

fixed fit parameter ignore boundary problems; fixes #128

Browse Source
This commit is contained in:
Dominik Demuth 2023-11-01 18:33:52 +01:00
parent 661ab81d7e
commit 5116622e42
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui_qt/fit/fit_parameter.py
View File

@ -243,7 +243,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
else: else:
lb, ub = bds[i] lb, ub = bds[i]
try: try:
if not (lb < p_i < ub): if not ((lb < p_i < ub) or (not is_fixed[i])):
raise ValueError(f'Parameter {g.name} is outside bounds ({lb}, {ub})') raise ValueError(f'Parameter {g.name} is outside bounds ({lb}, {ub})')
except TypeError: except TypeError:
pass pass

2
src/nmreval/fit/parameter.py
View File

@ -222,7 +222,7 @@ class Parameter:
self.var = False self.var = False
else: else:
if isinstance(self.lb, (int, float)) and isinstance(self.ub, (int, float)): if isinstance(self.lb, (int, float)) and isinstance(self.ub, (int, float)):
if self.lb <= value <= self.ub: if (self.lb <= value <= self.ub) or (not self.var):
self._value = value self._value = value
else: else:
raise ValueError('Value of parameter is outside bounds') raise ValueError('Value of parameter is outside bounds')