Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/PopulationAIF_DCE/test_popAIF_preclinical_ST_USyd_AUS.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def setup_module(module):
global filename_prefix # we want to change the global variable
os.makedirs('./test/results/PopulationAIF_DCE', exist_ok=True)
filename_prefix = 'PopulationAIF_DCE/TestResults_PopAIF'
log_init(filename_prefix, '_preclinical_AIF_ST_Sydney_AUS', ['label', 'time (us)', 'time_ref', 'aif_ref', 'cb_measured'])
log_init(filename_prefix, '_preclinical_AIF_ST_USyd_AUS', ['label', 'time (us)', 'time_ref', 'aif_ref', 'cb_measured'])

# Use the test data to generate a parametrize decorator. This causes the following
# test to be run for every test case listed in test_data...
Expand All @@ -38,6 +38,6 @@ def test_preclinical_AIF_ST_Sydney_AUS(label, time, cb_ref_values, delay,
row_data = []
for t, ref, meas in zip(time, cb_ref_values, AIF_P):
row_data.append([label, f"{exc_time:.0f}", t, ref, meas])
log_results(filename_prefix, '_preclinical_AIF_ST_Sydney_AUS', row_data)
log_results(filename_prefix, '_preclinical_AIF_ST_USyd_AUS', row_data)

np.testing.assert_allclose([AIF_P], [cb_ref_values], rtol=r_tol, atol=a_tol)
10 changes: 5 additions & 5 deletions test/results-meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"path": "../test/results/T1_mapping",
"filename": "TestResults_T1mapping__ZA_McGill_CAN_t1_VFA_lin.csv",
"filename": "TestResults_T1mapping_ZA_McGill_CAN_t1_VFA_lin.csv",
"category": "T1mapping",
"method": "linear",
"author": "ZA_McGill_CAN"
Expand Down Expand Up @@ -106,7 +106,7 @@
},
{
"path": "../test/results/SI_to_Conc",
"filename": "TestResults_SI2Conc_ST_USyd_Aus.csv",
"filename": "TestResults_SI2Conc__ST_USyd_AUS.csv",
"category": "SI_to_Conc",
"method": "",
"author": "ST_USyd_Aus"
Expand Down Expand Up @@ -295,21 +295,21 @@
},
{
"path": "../test/results/DCEmodels",
"filename": "TestResults_models_ST_USyd_Aus_etofts.csv",
"filename": "TestResults_models_ST_USyd_AUS_etofts.csv",
"category": "DCEmodels",
"method": "etofts",
"author": "ST_USyd_Aus"
},
{
"path": "../test/results/DCEmodels",
"filename": "TestResults_models_ST_USyd_Aus_patlak.csv",
"filename": "TestResults_models_ST_USyd_AUS_patlak.csv",
"category": "DCEmodels",
"method": "patlak",
"author": "ST_USyd_Aus"
},
{
"path": "../test/results/DCEmodels",
"filename": "TestResults_models_ST_USyd_Aus_tofts.csv",
"filename": "TestResults_models_ST_USyd_AUS_tofts.csv",
"category": "DCEmodels",
"method": "tofts",
"author": "ST_USyd_Aus"
Expand Down