From 433066742d3466360685eda66ba56e87ca93c26f Mon Sep 17 00:00:00 2001
From: "valentin.emiya" <valentin.emiya@lif.univ-mrs.fr>
Date: Thu, 3 Dec 2020 10:43:36 +0100
Subject: [PATCH] new params
---
python/tffpy/experiments/exp_approx.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/python/tffpy/experiments/exp_approx.py b/python/tffpy/experiments/exp_approx.py
index 8b5f621..ab069ba 100644
--- a/python/tffpy/experiments/exp_approx.py
+++ b/python/tffpy/experiments/exp_approx.py
@@ -38,12 +38,17 @@ class ApproxExperiment(SolveTffExperiment):
solver_tolerance_arrf=tol,
solver_tol_subregions=solver_tol_subregions,
measure='t_arrf').mean())
+ rank_res = float(res.sel(
+ solver_tolerance_arrf=tol,
+ solver_tol_subregions=solver_tol_subregions,
+ measure='rank_sum').mean())
if solver_tol_subregions is None:
measure_name = measure + '-1'
else:
measure_name = measure + '-P'
- print('{}: mean={:.2f} std={:.2g} tol={}, t={}'
- .format(measure_name, mean_res, std_res, tol, t_res))
+ print('{}: mean={:.2f} std={:.2g} tol={}, t={}, rk={}'
+ .format(measure_name, mean_res, std_res, tol,
+ t_res, rank_res))
def plot_results(self):
# No more need for this method
@@ -72,9 +77,10 @@ class ApproxExperiment(SolveTffExperiment):
crop=None,
fig_dir=None)
solver_params = dict(tol_subregions=[None, 1e-5],
- tolerance_arrf=10**np.linspace(-3, -0.5, 5),
+ tolerance_arrf=list(10**np.arange(-3, -0.5, 1))
+ + list(10**np.arange(-1, 0, 0.2)),
proba_arrf=1 - 1e-4,
- rand_state=np.arange(5))
+ rand_state=np.arange(3))
if setting == 'light':
problem_params['win_choice'] = 'gauss 64',
problem_params['crop'] = 4096
--
GitLab