fix minor bug in display results

python/tffpy/experiments/exp_solve_tff.py

@@ -61,7 +61,7 @@ class SolveTffExperiment(Experiment):
         if setting == 'light':
             data_params['loc_source'] = 'bird'
             data_params['wideband_src'] = 'car'
-            problem_params['win_choice'] = 'hann 128'
+            problem_params['win_choice'] = ['gauss 64', 'hann 128']
             problem_params['crop'] = 4096
             solver_params['tolerance_arrf'] = 1e-2
             solver_params['proba_arrf'] = 1 - 1e-2
@@ -121,7 +121,7 @@ class SolveTffExperiment(Experiment):
         # Scatter plot for running times : tff-1 vs. tff-P
         plt.figure()
         for win_type in coords_dict['problem_win_choice']['data']:
-            t_tff1 = results.sel(measure=['t_lambda_est', 't_arrf', 't_evdn'],
+            t_tff1 = results.sel(measure=['t_lambda_tff', 't_arrf', 't_evdn'],
                                  problem_win_choice=win_type,
                                  solver_tol_subregions=None)
             t_tff1 = t_tff1.sum(dim='measure')
@@ -129,7 +129,7 @@ class SolveTffExperiment(Experiment):
             not_none = coords_dict['solver_tol_subregions']['data'].copy()
             not_none.remove(None)
             not_none = not_none[0]
-            t_tffp = results.sel(measure=['t_lambda_est', 't_arrf',
+            t_tffp = results.sel(measure=['t_lambda_tff', 't_arrf',
                                           't_evdn', 't_subreg'],
                                  problem_win_choice=win_type,
                                  solver_tol_subregions=not_none)
@@ -160,7 +160,7 @@ class SolveTffExperiment(Experiment):
             mask_size_tff1 = results.sel(measure=['mask_size'],
                                          problem_win_choice=win_type,
                                          solver_tol_subregions=None).squeeze()
-            t_tff1 = results.sel(measure=['t_lambda_est', 't_arrf', 't_evdn'],
+            t_tff1 = results.sel(measure=['t_lambda_tff', 't_arrf', 't_evdn'],
                                  problem_win_choice=win_type,
                                  solver_tol_subregions=None)
             t_tff1 = t_tff1.sum(dim='measure')
@@ -176,7 +176,7 @@ class SolveTffExperiment(Experiment):
                 measure=['mask_size'],
                 problem_win_choice=win_type,
                 solver_tol_subregions=not_none).squeeze()
-            t_tffp = results.sel(measure=['t_lambda_est', 't_arrf',
+            t_tffp = results.sel(measure=['t_lambda_tff', 't_arrf',
                                           't_evdn', 't_subreg'],
                                  problem_win_choice=win_type,
                                  solver_tol_subregions=not_none)
@@ -221,7 +221,7 @@ class SolveTffExperiment(Experiment):
             measure='sdr_tff',
             solver_tol_subregions=not_none).squeeze().values.reshape(-1)
         sdr_tffo = results.sel(
-            measure='sdr_oracle_sdr',
+            measure='sdr_tffo',
             solver_tol_subregions=not_none).squeeze().values.reshape(-1)
         sdr_interp = results.sel(
             measure='sdr_interp',
@@ -236,7 +236,7 @@ class SolveTffExperiment(Experiment):
             measure='is_tff',
             solver_tol_subregions=not_none).squeeze().values.reshape(-1)
         is_tffo = results.sel(
-            measure='is_oracle_sdr',
+            measure='is_tffo',
             solver_tol_subregions=not_none).squeeze().values.reshape(-1)
         is_interp = results.sel(
             measure='is_interp',

python/tffpy/scripts/script_exp_solve_tff.py

@@ -4,6 +4,7 @@
 .. moduleauthor:: Valentin Emiya
 """
 from yafe.utils import generate_oar_script
+import matplotlib.pyplot as plt
 
 from tffpy.experiments.exp_solve_tff import \
     SolveTffExperiment, create_and_run_light_experiment
@@ -24,8 +25,8 @@ if __name__ == '__main__':
                                '2 - Display results of light experiment',
                                '3 - Full experiment: create full experiment',
                                '4 - Generate OAR script',
-                               '5 - Full experiment: download results',
-                               '6 - Full experiment: collect results',
+                               '5 - Full experiment: collect results',
+                               '6 - Full experiment: download results',
                                '7 - Full experiment: display results',
                                '8 - Figures for task 12 (bird + car, TFF-1)',
                                '9 - Figures for task 13 (bird + car, TFF-P)',
@@ -41,6 +42,8 @@ if __name__ == '__main__':
                 setting='light', force_reset=False)
             for idt in range(light_exp.n_tasks):
                 light_exp.plot_task(idt=idt, fontsize=16)
+                plt.close('all')
+            light_exp.plot_results()
         elif answer == 3:
             experiment = SolveTffExperiment.get_experiment(
                 setting='full', force_reset=True)
@@ -55,6 +58,9 @@ if __name__ == '__main__':
                                 activate_env_command='source activate py36',
                                 use_gpu=False)
         elif answer == 5:
+            experiment.collect_results()
+            experiment.display_status()
+        elif answer == 6:
             to_dir = str(experiment.xp_path)
             from_dir = \
                 '/data1/home/valentin.emiya/data_exp/SolveTffExperiment/'
@@ -69,9 +75,6 @@ if __name__ == '__main__':
                             + from_dir
                             + '*.*',
                             to_dir]))
-        elif answer == 6:
-            experiment.collect_results()
-            experiment.display_status()
         elif answer == 7:
             experiment.plot_results()
             experiment.display_status()