Skip to content

Commit 7d4e4dd

Browse files
committed
new tests
1 parent b277da9 commit 7d4e4dd

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

tests/proc/test_fitter_refactor.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,21 +279,21 @@ def _make_fitter(self, lower_bounds=None, upper_bounds=None):
279279

280280
def test_unbounded_unchanged(self):
281281
"""Unbounded fit must return a valid sidpy.Dataset with finite params."""
282-
result, _ = self._make_fitter().do_fit()
282+
result = self._make_fitter().do_fit()
283283
self.assertIsInstance(result, sid.Dataset)
284284
self.assertTrue(np.all(np.isfinite(np.array(result))))
285285

286286
def test_scalar_lower_bound(self):
287287
"""Scalar lower_bounds=0 — all returned params must be >= 0."""
288-
result, _ = self._make_fitter(lower_bounds=0.0).do_fit()
288+
result = self._make_fitter(lower_bounds=0.0).do_fit()
289289
params = np.array(result)
290290
self.assertTrue(np.all(params >= -1e-6),
291291
msg=f"Some params violated lower_bound=0: min={params.min()}")
292292

293293
def test_scalar_upper_bound(self):
294294
"""Scalar upper_bounds=1e6 — all returned params must be <= 1e6."""
295295
upper = 1e6
296-
result, _ = self._make_fitter(upper_bounds=upper).do_fit()
296+
result = self._make_fitter(upper_bounds=upper).do_fit()
297297
params = np.array(result)
298298
self.assertTrue(np.all(params <= upper + 1e-6),
299299
msg=f"Some params violated upper_bound={upper}: max={params.max()}")
@@ -303,7 +303,7 @@ def test_per_param_bounds_respected(self):
303303
n = self._make_fitter().num_params
304304
lb = np.zeros(n)
305305
ub = np.full(n, 1e6)
306-
result, _ = self._make_fitter(lower_bounds=lb, upper_bounds=ub).do_fit()
306+
result = self._make_fitter(lower_bounds=lb, upper_bounds=ub).do_fit()
307307
params = np.array(result)
308308
for i in range(n):
309309
p = params[..., i]
@@ -342,7 +342,7 @@ def test_bounds_stored_in_metadata(self):
342342
n = self._make_fitter().num_params
343343
lb = list(np.zeros(n))
344344
ub = list(np.ones(n) * 1e6)
345-
result, _ = self._make_fitter(lower_bounds=lb, upper_bounds=ub).do_fit()
345+
result = self._make_fitter(lower_bounds=lb, upper_bounds=ub).do_fit()
346346
meta = result.metadata["fit_parameters"]
347347
self.assertIn("lower_bounds", meta)
348348
self.assertIn("upper_bounds", meta)
@@ -351,7 +351,7 @@ def test_bounds_stored_in_metadata(self):
351351

352352
def test_none_bounds_metadata_is_none(self):
353353
"""When no bounds are passed, metadata entries must be None."""
354-
result, _ = self._make_fitter().do_fit()
354+
result = self._make_fitter().do_fit()
355355
meta = result.metadata["fit_parameters"]
356356
self.assertIsNone(meta.get("lower_bounds"))
357357
self.assertIsNone(meta.get("upper_bounds"))
@@ -360,7 +360,7 @@ def test_bounds_with_nonlinear_loss(self):
360360
"""Bounds + non-linear loss must not raise (both require method='trf')."""
361361
fitter = self._make_fitter(lower_bounds=0.0)
362362
try:
363-
result, _ = fitter.do_fit(loss='soft_l1')
363+
result = fitter.do_fit(loss='soft_l1')
364364
except Exception as e:
365365
self.fail(f"do_fit raised with bounds + non-linear loss: {e}")
366366
self.assertIsInstance(result, sid.Dataset)
@@ -370,4 +370,4 @@ def test_bounds_with_return_cov(self):
370370
n = self._make_fitter().num_params
371371
params, cov = self._make_fitter(lower_bounds=0.0).do_fit(return_cov=True)
372372
self.assertEqual(cov.shape[-2:], (n, n),
373-
msg=f"Covariance shape {cov.shape} does not end in ({n},{n})")
373+
msg=f"Covariance shape {cov.shape} does not end in ({n},{n})")

0 commit comments

Comments
 (0)