Skip to content

Commit 2505164

Browse files
author
IvanARashid
committed
Changed to dictionary outputs
1 parent dc99c0c commit 2505164

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

tests/IVIMmodels/unit_tests/test_ivim_fit.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,16 @@ def test_ivim_fit_saved(name, bvals, data, algorithm, xfail, kwargs, tolerances,
6464
signal, ratio = signal_helper(data["data"])
6565

6666
tolerances = tolerances_helper(tolerances, ratio, data["noise"])
67-
[f_fit, Dp_fit, D_fit] = fit.osipi_fit(signal, bvals)
67+
#[f_fit, Dp_fit, D_fit] = fit.osipi_fit(signal, bvals)
68+
fit_result = fit.osipi_fit(signal, bvals)
6869
def to_list_if_needed(value):
6970
return value.tolist() if isinstance(value, np.ndarray) else value
7071
test_result = {
7172
"name": name,
7273
"algorithm": algorithm,
73-
"f_fit": to_list_if_needed(f_fit),
74-
"Dp_fit": to_list_if_needed(Dp_fit),
75-
"D_fit": to_list_if_needed(D_fit),
74+
"f_fit": to_list_if_needed(fit_result['f']),
75+
"Dp_fit": to_list_if_needed(fit_result['D*']),
76+
"D_fit": to_list_if_needed(fit_result['D']),
7677
"f": to_list_if_needed(data['f']),
7778
"Dp": to_list_if_needed(data['Dp']),
7879
"D": to_list_if_needed(data['D']),
@@ -83,9 +84,9 @@ def to_list_if_needed(value):
8384

8485
record_property('test_data', test_result)
8586

86-
npt.assert_allclose(data['f'], f_fit, rtol=tolerances["rtol"]["f"], atol=tolerances["atol"]["f"])
87+
npt.assert_allclose(data['f'], fit_result['f'], rtol=tolerances["rtol"]["f"], atol=tolerances["atol"]["f"])
8788

8889
if data['f']<0.80: # we need some signal for D to be detected
8990
npt.assert_allclose(data['D'], fit_result['D'], rtol=tolerances["rtol"]["D"], atol=tolerances["atol"]["D"])
9091
if data['f']>0.03: #we need some f for D* to be interpretable
91-
npt.assert_allclose(data['Dp'], Dp_fit, rtol=tolerances["rtol"]["Dp"], atol=tolerances["atol"]["Dp"])
92+
npt.assert_allclose(data['Dp'], fit_result['D*'], rtol=tolerances["rtol"]["Dp"], atol=tolerances["atol"]["Dp"])

0 commit comments

Comments
 (0)