From e3e3631e932c1d5ba998b4a14cdaea3f44ac19ac Mon Sep 17 00:00:00 2001 From: Le Roux Erwan <erwan.le-roux@irstea.fr> Date: Mon, 3 Jun 2019 16:57:28 +0200 Subject: [PATCH] [HYPERCUBE VISUALIZER] fix error in deviance value (that was equal to 2 deviance) --- .../hypercube_visualization/main_hypercube_visualization.py | 2 +- .../univariate_test/abstract_gev_change_point_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py b/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py index dd866ec9..cc84a572 100644 --- a/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py +++ b/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py @@ -102,7 +102,7 @@ def full_altitude_year_hypercube(): for study_class in SCM_STUDIES[:1]: for trend_test_class in [GevLocationChangePointTest, GevScaleChangePointTest, GevShapeChangePointTest][:1]: - for last_starting_year in [1967, 1977, 1987, 1997, 2007, None][-2::-1]: + for last_starting_year in [1967, 1977, 1987, 1997, 2007, None][-1:]: visualizers = [ StudyVisualizer(study, temporal_non_stationarity=True, verbose=False, multiprocessing=True) for study in study_iterator(study_class=study_class, only_first_one=only_first_one, diff --git a/experiment/trend_analysis/univariate_test/abstract_gev_change_point_test.py b/experiment/trend_analysis/univariate_test/abstract_gev_change_point_test.py index 9348e9ba..2524d32c 100644 --- a/experiment/trend_analysis/univariate_test/abstract_gev_change_point_test.py +++ b/experiment/trend_analysis/univariate_test/abstract_gev_change_point_test.py @@ -57,7 +57,7 @@ class AbstractGevChangePointTest(AbstractUnivariateTest): @property def likelihood_ratio(self): - return 2 * (self.non_stationary_deviance - self.stationary_deviance) + return self.non_stationary_deviance - self.stationary_deviance @property def non_stationary_nllh(self): -- GitLab