diff --git a/python/tffpy/experiments/exp_variance.py b/python/tffpy/experiments/exp_variance.py index 1e70180e8173c8b7d1a523fba53aa8bf0540d09a..03acde350c1cf66d00bd523fca501fe060bbc0bb 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 85574904121251e7407131101c5953932689977f..e4d339e85e77e97b8e63083435a9906ab765c93f 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))