Skip to content

Commit 165a6a8

Browse files
petravanhoudtpetravanhoudt
authored
Merge pull request #109 from OSIPI/consistent_naming
update results_meta.json to be consistent with name changes
2 parents 472c44a + b640bbe commit 165a6a8

12 files changed

+49
-50
lines changed

‎test/DCEmodels/test_DCEmodels_2CXM_OGJ_OsloU_NOR.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_module(module):
1818
global filename_prefix # we want to change the global variable
1919
os.makedirs('./test/results/DCEmodels', exist_ok=True)
2020
filename_prefix = 'DCEmodels/TestResults_models'
21-
log_init(filename_prefix, '_OGJ_OsloU_Norway_2CXM_LLSQ',
21+
log_init(filename_prefix, '_OGJ_OsloU_NOR_2CXM_LLSQ',
2222
['label', 'time (us)', 'vp_ref', 've_ref', 'fp_ref', 'ps_ref', 'vp_meas', 've_meas', 'fp_meas', 'ps_meas'])
2323

2424

‎test/DCEmodels/test_DCEmodels_Patlak_ST_USyd_AUS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_module(module):
1818
global filename_prefix # we want to change the global variable
1919
os.makedirs('./test/results/DCEmodels', exist_ok=True)
2020
filename_prefix = 'DCEmodels/TestResults_models'
21-
log_init(filename_prefix, '_ST_USydAUS_patlak', ['label', 'time (us)',
21+
log_init(filename_prefix, '_ST_USyd_AUS_patlak', ['label', 'time (us)',
2222
'vp_ref', 'ps_ref', 'vp_meas', 'ps_meas'])
2323

2424
# Use the test data to generate a parametrize decorator. This causes the following
@@ -46,7 +46,7 @@ def test_ST_USydAUS_Patlak_model(label, t_array, C_t_array,
4646
exc_time = 1e6 * (perf_counter() - tic) # measure execution time
4747

4848
# log results
49-
log_results(filename_prefix, '_ST_USydAUS_patlak', [
49+
log_results(filename_prefix, '_ST_USyd_AUS_patlak', [
5050
[label, f"{exc_time:.0f}", vp_ref, ps_ref, vp_meas, ps_meas]])
5151

5252
# run test

‎test/DCEmodels/test_DCEmodels_etofts_MB_QBI_UoManchester_UK.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def setup_module(module):
1717
global filename_prefix # we want to change the global variable
1818
os.makedirs('./test/results/DCEmodels', exist_ok=True)
1919
filename_prefix = 'DCEmodels/TestResults_models'
20-
log_init(filename_prefix, '_MB_QBI_UoManchester_etofts', ['label', 'time (us)', 'Ktrans_ref', 've_ref', 'vp_ref', 'Ktrans_meas', 've_meas', 'vp_meas'])
20+
log_init(filename_prefix, '_MB_QBI_UoManchester_UK_etofts', ['label', 'time (us)', 'Ktrans_ref', 've_ref', 'vp_ref', 'Ktrans_meas', 've_meas', 'vp_meas'])
2121

2222

2323
# Use the test data to generate a parametrize decorator. This causes the following
@@ -39,7 +39,7 @@ def test_MB_QBI_UoManchester_extended_tofts_kety_model(label, t_array, C_array,
3939
exc_time = 1e6 * (perf_counter() - tic) # measure execution time
4040

4141
# log results
42-
log_results(filename_prefix, '_MB_QBI_UoManchester_etofts', [[label, f"{exc_time:.0f}", Ktrans_ref, ve_ref, vp_ref, Ktrans_meas, ve_meas, vp_meas]])
42+
log_results(filename_prefix, '_MB_QBI_UoManchester_UK_etofts', [[label, f"{exc_time:.0f}", Ktrans_ref, ve_ref, vp_ref, Ktrans_meas, ve_meas, vp_meas]])
4343

4444
# run test
4545
np.testing.assert_allclose([ve_meas], [ve_ref], rtol=r_tol_ve, atol=a_tol_ve)

‎test/DCEmodels/test_DCEmodels_etofts_ST_USyd_AUS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_module(module):
1818
global filename_prefix # we want to change the global variable
1919
os.makedirs('./test/results/DCEmodels', exist_ok=True)
2020
filename_prefix = 'DCEmodels/TestResults_models'
21-
log_init(filename_prefix, '_ST_USydAUS_etofts', ['label', 'time (us)',
21+
log_init(filename_prefix, '_ST_USyd_AUS_etofts', ['label', 'time (us)',
2222
'Ktrans_ref', 've_ref', 'vp_ref', 'Ktrans_meas', 've_meas', 'vp_meas'])
2323

2424

@@ -44,7 +44,7 @@ def testST_USydAUS_extended_tofts_kety_model(label, t_array, C_array, ca_array,
4444
exc_time = 1e6 * (perf_counter() - tic) # measure execution time
4545

4646
# log results
47-
log_results(filename_prefix, '_ST_USydAUS_etofts', [
47+
log_results(filename_prefix, '_ST_USyd_AUS_etofts', [
4848
[label, f"{exc_time:.0f}", Ktrans_ref, ve_ref, vp_ref, Ktrans_meas, ve_meas, vp_meas]])
4949

5050
# run test

‎test/DCEmodels/test_DCEmodels_tofts_ST_USyd_AUS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def setup_module(module):
1717
global filename_prefix # we want to change the global variable
1818
os.makedirs('./test/results/DCEmodels', exist_ok=True)
1919
filename_prefix = 'DCEmodels/TestResults_models'
20-
log_init(filename_prefix, '_ST_USydAUS_tofts', ['label', 'time (us)',
20+
log_init(filename_prefix, '_ST_USyd_AUS_tofts', ['label', 'time (us)',
2121
'Ktrans_ref', 've_ref', 'Ktrans_meas', 've_meas'])
2222

2323

@@ -43,7 +43,7 @@ def testST_USydAUS_tofts_model(label, t_array, C_array, ca_array, ta_array, ve_r
4343
exc_time = 1e6 * (perf_counter() - tic) # measure execution time
4444

4545
# log results
46-
log_results(filename_prefix, '_ST_USydAUS_tofts', [
46+
log_results(filename_prefix, '_ST_USyd_AUS_tofts', [
4747
[label, f"{exc_time:.0f}", Ktrans_ref, ve_ref, Ktrans_meas, ve_meas]])
4848

4949
# run test

‎test/PopulationAIF_DCE/test_popAIF_Parker_ST_USyd_AUS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def setup_module(module):
2020
global filename_prefix # we want to change the global variable
2121
os.makedirs('./test/results/PopulationAIF_DCE', exist_ok=True)
2222
filename_prefix = 'PopulationAIF_DCE/TestResults_PopAIF'
23-
log_init(filename_prefix, '_Parker_AIF_ST_Sydney_AUS', ['label', 'time ('
23+
log_init(filename_prefix, '_Parker_AIF_ST_USyd_AUS', ['label', 'time ('
2424
'us)', 'time_ref', 'aif_ref', 'cb_measured'])
2525

2626
# Use the test data to generate a parametrize decorator. This causes the following
@@ -41,6 +41,6 @@ def test_Parker_AIF_ST_Sydney_AUS(label, time, cb_ref_values, delay, a_tol,
4141
row_data = []
4242
for t, ref, meas in zip(time, cb_ref_values, AIF_P):
4343
row_data.append([label, f"{exc_time:.0f}", t, ref, meas])
44-
log_results(filename_prefix, '_Parker_AIF_ST_Sydney_AUS', row_data)
44+
log_results(filename_prefix, '_Parker_AIF_ST_USyd_AUS', row_data)
4545

4646
np.testing.assert_allclose([AIF_P], [cb_ref_values], rtol=r_tol, atol=a_tol)

‎test/SI_to_Conc/test_SI2Conc_LEK_Edinburgh_UK.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_module(module):
1818
global filename_prefix # we want to change the global variable
1919
os.makedirs('./test/results/SI_to_Conc', exist_ok=True)
2020
filename_prefix = 'SI_to_Conc/TestResults_SI2Conc'
21-
log_init(filename_prefix, '_LEK_UoEdinburgh', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
21+
log_init(filename_prefix, '_LEK_UoEdinburgh_UK', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
2222

2323
# Use the test data to generate a parametrize decorator. This causes the following
2424
# test to be run for every test case listed in test_data...
@@ -39,7 +39,7 @@ def test_LEK_UoEdinburgh_UK_SI2Conc(label, fa, tr, T1base, BLpts, r1, s_array, c
3939
row_data = []
4040
for ref, meas in zip(conc_array[1:], conc_curve[1:]/r1):
4141
row_data.append([label, f"{exc_time:.0f}", ref, meas])
42-
log_results(filename_prefix, '_LEK_UoEdinburgh', row_data)
42+
log_results(filename_prefix, '_LEK_UoEdinburgh_UK', row_data)
4343

4444
# testing
4545
conc_array=conc_array*r1 # This function doesn't include r1, so multiply it out before testing

‎test/SI_to_Conc/test_SI2Conc_MB_QBI_UoManchester_UK.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def setup_module(module):
2020
global filename_prefix # we want to change the global variable
2121
os.makedirs('./test/results/SI_to_Conc', exist_ok=True)
2222
filename_prefix = 'SI_to_Conc/TestResults_SI2Conc'
23-
log_init(filename_prefix, '_MB_UoManchester', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
23+
log_init(filename_prefix, '_MB_UoManchester_UK', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
2424

2525
# Use the test data to generate a parametrize decorator. This causes the following
2626
# test to be run for every test case listed in test_data...
@@ -51,7 +51,7 @@ def test_MB_UoManchester_sig_to_conc(label, fa, tr, T1base, BLpts, r1, s_array,
5151
row_data = []
5252
for ref, meas in zip(conc_array, conc_curve):
5353
row_data.append([label, f"{exc_time:.0f}", ref, meas])
54-
log_results(filename_prefix, '_MB_UoManchester', row_data)
54+
log_results(filename_prefix, '_MB_UoManchester_UK', row_data)
5555

5656
np.testing.assert_allclose( conc_curve, conc_array, rtol=r_tol, atol=a_tol )
5757

‎test/SI_to_Conc/test_SI2Conc_MJT_UoEdinburgh_UK.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def setup_module(module):
2020
global filename_prefix # we want to change the global variable
2121
os.makedirs('./test/results/SI_to_Conc', exist_ok=True)
2222
filename_prefix = 'SI_to_Conc/TestResults_SI2Conc'
23-
log_init(filename_prefix, '_MJT_UoEdinburgh', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
24-
log_init(filename_prefix, '_MJT_UoEdinburgh_num', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
23+
log_init(filename_prefix, '_MJT_UoEdinburgh_UK', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
24+
log_init(filename_prefix, '_MJT_UoEdinburgh_UK_num', ['label', 'time (us)', 'conc_ref', 'conc_meas'])
2525

2626
# Use the test data to generate a parametrize decorator. This causes the following
2727
# test to be run for every test case listed in test_data...
@@ -61,7 +61,7 @@ def test_MJT_UoEdinburgh_UK_sig_to_conc_num(label, fa, tr, T1base, BLpts, r1, s_
6161
row_data = []
6262
for ref, meas in zip(conc_array[1:], conc_curve[1:]):
6363
row_data.append([label, f"{exc_time:.0f}", ref, meas])
64-
log_results(filename_prefix, '_MJT_UoEdinburgh_num', row_data)
64+
log_results(filename_prefix, '_MJT_UoEdinburgh_UK_num', row_data)
6565

6666
# testing
6767
np.testing.assert_allclose( conc_curve[1:], conc_array[1:], rtol=r_tol, atol=a_tol)
@@ -92,7 +92,7 @@ def test_MJT_UoEdinburgh_UK_sig_to_conc(label, fa, tr, T1base, BLpts, r1, s_arra
9292
row_data = []
9393
for ref, meas in zip(conc_array[1:], conc_curve[1:]):
9494
row_data.append([label, f"{exc_time:.0f}", ref, meas])
95-
log_results(filename_prefix, '_MJT_UoEdinburgh', row_data)
95+
log_results(filename_prefix, '_MJT_UoEdinburgh_UK', row_data)
9696

9797
# testing
9898
np.testing.assert_allclose( conc_curve[1:], conc_array[1:], rtol=r_tol, atol=a_tol)

‎test/SI_to_Conc/test_SI2Conc_ST_USyd_AUS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_module(module):
1818
global filename_prefix # we want to change the global variable
1919
os.makedirs('./test/results/SI_to_Conc', exist_ok=True)
2020
filename_prefix = 'SI_to_Conc/TestResults_SI2Conc'
21-
log_init(filename_prefix, '_ST_USydAUS', ['label', 'time (us)',
21+
log_init(filename_prefix, '_ST_USyd_AUS', ['label', 'time (us)',
2222
'conc_ref', 'conc_meas'])
2323

2424

@@ -46,7 +46,7 @@ def test_ST_USydAUS_signals2conc(label, fa, tr, T1base, BLpts, r1, s_array, conc
4646
row_data = []
4747
for ref, meas in zip(conc_array, conc_curve):
4848
row_data.append([label, f"{exc_time:.0f}", ref, meas])
49-
log_results(filename_prefix, '_ST_USydAUS', row_data)
49+
log_results(filename_prefix, '_ST_USyd_AUS', row_data)
5050

5151
np.testing.assert_allclose( [conc_curve], [conc_array], rtol=r_tol, atol=a_tol )
5252

0 commit comments

Comments
 (0)