From 26ac348a43ad2f03d96080e94cb03f1073a77005 Mon Sep 17 00:00:00 2001
From: "valentin.emiya" <valentin.emiya@lif.univ-mrs.fr>
Date: Mon, 30 Nov 2020 15:28:06 +0100
Subject: [PATCH] minor exp var

---
 python/tffpy/experiments/exp_variance.py    | 20 +++++++++++++++++++-
 python/tffpy/scripts/script_exp_variance.py |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/python/tffpy/experiments/exp_variance.py b/python/tffpy/experiments/exp_variance.py
index 1e70180..03acde3 100644
--- a/python/tffpy/experiments/exp_variance.py
+++ b/python/tffpy/experiments/exp_variance.py
@@ -17,6 +17,24 @@ class VarianceExperiment(SolveTffExperiment):
                                     force_reset=force_reset,
                                     suffix='Variance' + suffix)
 
+    def display_results(self):
+        res = self.load_results(array_type='xarray')
+        res = res.squeeze()
+        print('std(sdr_tff):', float(res.sel(measure='sdr_tff').std()))
+        print('std(sdr_tffo):', float(res.sel(measure='sdr_tffo').std()))
+        print('std(sdr_tffe):', float(res.sel(measure='sdr_tffe').std()))
+        print('std(is_tff):', float(res.sel(measure='is_tff').std()))
+        print('std(is_tffo):', float(res.sel(measure='is_tffo').std()))
+        print('std(is_tffe):', float(res.sel(measure='is_tffe').std()))
+
+    def plot_results(self):
+        # No more need for this method
+        pass
+
+    def plot_task(self, idt, fontsize=16):
+        # No more need for this method
+        pass
+
     @staticmethod
     def get_experiment(setting='full', force_reset=False):
         assert setting in ('full', 'light')
@@ -35,7 +53,7 @@ class VarianceExperiment(SolveTffExperiment):
                               or_mask=True,
                               crop=None,
                               fig_dir=None)
-        solver_params = dict(tol_subregions=None,
+        solver_params = dict(tol_subregions=1e-5,
                              tolerance_arrf=1e-3,
                              proba_arrf=1 - 1e-4,
                              rand_state=np.arange(100))
diff --git a/python/tffpy/scripts/script_exp_variance.py b/python/tffpy/scripts/script_exp_variance.py
index 8557490..e4d339e 100644
--- a/python/tffpy/scripts/script_exp_variance.py
+++ b/python/tffpy/scripts/script_exp_variance.py
@@ -124,7 +124,7 @@ if __name__ == '__main__':
                             + '*.*',
                             to_dir]))
         elif answer == 7:
-            experiment.plot_results()
             experiment.display_status()
+            experiment.display_results()
         else:
             print('Unknown answer: ' + str(answer))
-- 
GitLab