Skip to content

Commit e2b020c

Browse files
committed
fixed tests
1 parent 75b7e38 commit e2b020c

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

mantidimaging/core/fitting/test/fitting_engine_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ def test_find_best_fit(self):
4141
xvals = np.linspace(1, 10, 20)
4242
yvals = 3.1 * xvals + 2.7
4343

44-
result = self.engine.find_best_fit(xvals, yvals, [1, 1])
45-
self.assertAlmostEqual(result['a'], 3.1, 4)
46-
self.assertAlmostEqual(result['b'], 2.7, 4)
44+
fit_params, chi2 = self.engine.find_best_fit(xvals, yvals, [1, 1])
45+
self.assertAlmostEqual(fit_params['a'], 3.1, 4)
46+
self.assertAlmostEqual(fit_params['b'], 2.7, 4)

mantidimaging/gui/windows/spectrum_viewer/test/presenter_test.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,12 +466,15 @@ def test_on_initial_params_edited_updates_plot_correctly(self, is_initial_fit_vi
466466
self.view.spectrum_widget.get_roi = mock.Mock(return_value="mock_roi")
467467
self.presenter.model.get_spectrum = mock.Mock(return_value=np.array([1, 2, 3]))
468468
self.presenter.model.tof_data = np.array([1, 2, 3])
469-
self.presenter.model.fitting_engine.find_best_fit = mock.Mock(return_value={
470-
"mu": 1.0,
471-
"sigma": 2.0,
472-
"h": 3.0,
473-
"a": 4.0
474-
})
469+
self.presenter.model.fitting_engine.find_best_fit = mock.Mock(return_value=(
470+
{
471+
"mu": 1.0,
472+
"sigma": 2.0,
473+
"h": 3.0,
474+
"a": 4.0,
475+
},
476+
0.0,
477+
))
475478
self.view.scalable_roi_widget.set_fitted_parameter_values = mock.Mock()
476479
self.view.fittingDisplayWidget.is_initial_fit_visible.return_value = is_initial_fit_visible
477480

0 commit comments

Comments
 (0)