diff --git a/experiment/meteo_france_SCM_study/visualization/hypercube_visualization/main_hypercube_visualization.py b/experiment/meteo_france_SCM_study/visualization/hypercube_visualization/main_hypercube_visualization.py index dd743e1621abf8bf1499aef21c365b8bedc0daa9..13f2c34c57c30f6c25c33502d9e408d81abd0937 100644 --- a/experiment/meteo_france_SCM_study/visualization/hypercube_visualization/main_hypercube_visualization.py +++ b/experiment/meteo_france_SCM_study/visualization/hypercube_visualization/main_hypercube_visualization.py @@ -37,10 +37,10 @@ def full_trends_with_quantity_altitude_hypercube(): save_to_file = True only_first_one = False fast = False - add_detailed_plots = False + add_detailed_plots = True altitudes = ALL_ALTITUDES[3:-6] study_classes = SCM_STUDIES - for trend_test_class in [MannKendallTrendTest, GevLocationTrendTest, GevScaleTrendTest, GevShapeTrendTest][1:2]: + for trend_test_class in [MannKendallTrendTest, GevLocationTrendTest, GevScaleTrendTest, GevShapeTrendTest][:]: visualizers = [StudyVisualizer(study, temporal_non_stationarity=True, verbose=False, multiprocessing=True) for study in study_iterator_global(study_classes=study_classes, only_first_one=only_first_one, altitudes=altitudes)] @@ -94,8 +94,8 @@ def fast_trends_with_quantity_altitude_hypercube(): def main_run(): # fast_trends_with_altitude_hypercube() - fast_trends_with_quantity_altitude_hypercube() - # full_trends_with_quantity_altitude_hypercube() + # fast_trends_with_quantity_altitude_hypercube() + full_trends_with_quantity_altitude_hypercube() if __name__ == '__main__': diff --git a/experiment/trend_analysis/univariate_trend_test/abstract_gev_trend_test.py b/experiment/trend_analysis/univariate_trend_test/abstract_gev_trend_test.py index 1b734763ef92815abfaf407eb110e5b10d42b54e..eb09ead0f213fdfa5f8a5976a3620677149474e9 100644 --- a/experiment/trend_analysis/univariate_trend_test/abstract_gev_trend_test.py +++ b/experiment/trend_analysis/univariate_trend_test/abstract_gev_trend_test.py @@ -81,7 +81,10 @@ class AbstractGevTrendTest(AbstractTrendTest): @property def test_trend_strength(self): - return self.percentage_of_change_per_year + if self.crashed: + return 0.0 + else: + return self.percentage_of_change_per_year @property def percentage_of_change_per_year(self): diff --git a/experiment/trend_analysis/univariate_trend_test/abstract_trend_test.py b/experiment/trend_analysis/univariate_trend_test/abstract_trend_test.py index 1462db9486414d12141469913b32a65612f2feb5..f08e7daa89119d6bad060d30c961040a0157ac2f 100644 --- a/experiment/trend_analysis/univariate_trend_test/abstract_trend_test.py +++ b/experiment/trend_analysis/univariate_trend_test/abstract_trend_test.py @@ -21,6 +21,11 @@ class AbstractTrendTest(object): SIGNIFICANCE_LEVEL = 0.05 + def __init__(self, years_after_change_point, maxima_after_change_point): + self.years_after_change_point = years_after_change_point + self.maxima_after_change_point = maxima_after_change_point + assert len(self.years_after_change_point) == len(self.maxima_after_change_point) + @classmethod def trend_type_to_style(cls): d = OrderedDict() @@ -49,10 +54,7 @@ class AbstractTrendTest(object): else: return plt.cm.binary - def __init__(self, years_after_change_point, maxima_after_change_point): - self.years_after_change_point = years_after_change_point - self.maxima_after_change_point = maxima_after_change_point - assert len(self.years_after_change_point) == len(self.maxima_after_change_point) + @property def n(self): diff --git a/extreme_estimator/extreme_models/utils.py b/extreme_estimator/extreme_models/utils.py index 7928ca73ea369fa6813fe06ee8ab7b9b9d01b0fd..0ba41b4ae625b00f0d76a7cb7e91d55848e1ff2b 100644 --- a/extreme_estimator/extreme_models/utils.py +++ b/extreme_estimator/extreme_models/utils.py @@ -55,10 +55,11 @@ class WarningWhileRunningR(Warning): class WarningMaximumAbsoluteValueTooHigh(Warning): pass -class OptimizationConstants(object): +class OptimizationConstants(object): USE_MAXIT = False + class SafeRunException(Exception): pass