Skip to content

Commit 1f4df44

Browse files
committed
pr response
1 parent 3bda6df commit 1f4df44

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

src/easyscience/fitting/minimizers/minimizer_bumps.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ def fit(
112112
minimizer_kwargs.update(engine_kwargs)
113113

114114
if tolerance is not None:
115-
if 0.1 < tolerance:
116-
raise ValueError('Tolerance must be equal or smaller than 0.1')
117115
minimizer_kwargs['ftol'] = tolerance # tolerance for change in function value
118116
minimizer_kwargs['xtol'] = tolerance # tolerance for change in parameter value, could be an independent value
119117
if max_evaluations is not None:

src/easyscience/fitting/minimizers/minimizer_dfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def _prepare_kwargs(tolerance: Optional[float] = None, max_evaluations: Optional
281281
if max_evaluations is not None:
282282
kwargs['maxfun'] = max_evaluations # max number of function evaluations
283283
if tolerance is not None:
284-
if 0.1 < tolerance:
284+
if 0.1 < tolerance: # dfo module throws errer if larger value
285285
raise ValueError('Tolerance must be equal or smaller than 0.1')
286286
kwargs['rhoend'] = tolerance # size of the trust region
287287
return kwargs

tests/integration_tests/Fitting/test_fitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_basic_max_evaluations(fit_engine):
170170
assert "Objective has been called MAXFUN times" in str(e)
171171

172172

173-
@pytest.mark.parametrize("fit_engine,tolerance", [(None, 10), (AvailableMinimizers.LMFit, 10), (AvailableMinimizers.Bumps, 0.1), (AvailableMinimizers.DFO, 0.1)])
173+
@pytest.mark.parametrize("fit_engine,tolerance", [(None, 10), (AvailableMinimizers.LMFit, 10), (AvailableMinimizers.Bumps, 10), (AvailableMinimizers.DFO, 0.1)])
174174
def test_basic_tolerance(fit_engine, tolerance):
175175
ref_sin = AbsSin(0.2, np.pi)
176176
sp_sin = AbsSin(0.354, 3.05)

0 commit comments

Comments
 (0)