[refactor] remove trend analysis folder. create extreme_trend_test folder

projects/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py → projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py

@@ -4,7 +4,7 @@ import numpy as np
 from cached_property import cached_property
 
 from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \
     StudyVisualizerForNonStationaryTrends
 
 

projects/exceeding_snow_loads/data/main_example_swe_total_plot.py → projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py

@@ -5,7 +5,7 @@ from experiment.meteo_france_data.scm_models_data.visualization.main_study_visua
     study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION
 from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \
     StudyVisualizer
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
 
 
 def tuples_for_examples_paper1(examples_for_the_paper=True):

projects/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py → projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py

@@ -7,10 +7,10 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer
     StudyVisualizer
 import matplotlib.pyplot as plt
 
-from projects.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \
     CrocusDifferenceSnowLoad, \
     CrocusSnowDensityAtMaxofSwe, CrocusSnowDepthDifference
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
 
 
 def max_graph_annual_maxima_comparison():

projects/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py → projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py

@@ -4,10 +4,10 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer
     StudyVisualizer
 import matplotlib.pyplot as plt
 
-from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \
     CrocusDifferenceSnowLoad, \
     CrocusSnowDensityAtMaxofSwe, CrocusSnowDepthDifference
-from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
 
 
 def max_graph_annual_maxima_comparison():

projects/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py → projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py

@@ -4,9 +4,9 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer
     StudyVisualizer
 import matplotlib.pyplot as plt
 
-from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \
     CrocusSnowDensityAtMaxofSwe
-from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
 
 
 def density_wrt_altitude():

projects/exceeding_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py → projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py

@@ -2,20 +2,11 @@ from multiprocessing.pool import Pool
 
 import matplotlib as mpl
 
-from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoad3Days, \
-    CrocusSnowLoad5Days, CrocusSnowLoad7Days
-from projects.exceeding_snow_loads.check_mle_convergence_for_trends.uncertainty_interval_size import \
-    uncertainty_interval_size
-from projects.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer
-from projects.exceeding_snow_loads.paper_utils import paper_study_classes, paper_altitudes
-from projects.exceeding_snow_loads.result_trends_and_return_levels.plot_diagnosis_risk import plot_diagnosis_risk
-from projects.exceeding_snow_loads.result_trends_and_return_levels.plot_selection_curves import plot_selection_curves
-from projects.exceeding_snow_loads.result_trends_and_return_levels.plot_trend_curves import plot_trend_curves, \
-    plot_trend_map
-from projects.exceeding_snow_loads.result_trends_and_return_levels.plot_uncertainty_curves import plot_uncertainty_massifs
-from projects.exceeding_snow_loads.result_trends_and_return_levels.plot_uncertainty_histogram import \
-    plot_uncertainty_histogram
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
+from extreme_trend_test.visualizers.utils import load_altitude_to_visualizer
+from projects.exceeding_snow_loads.utils import paper_study_classes, paper_altitudes
+from projects.exceeding_snow_loads.section_results.plot_uncertainty_curves import plot_uncertainty_massifs
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \
     StudyVisualizerForNonStationaryTrends
 from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
     ConfidenceIntervalMethodFromExtremes
@@ -99,29 +90,3 @@ if __name__ == '__main__':
     #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.my_bayes,
     #                                          ConfidenceIntervalMethodFromExtremes.ci_mle][1:],
     #                     multiprocessing=True)
-    # intermediate_result(altitudes=[900, 1200], massif_names=['Maurienne'],
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.my_bayes,
-    #                                          ConfidenceIntervalMethodFromExtremes.ci_mle][1:],
-    #                     non_stationary_uncertainty=[False, True][:],
-    #                     multiprocessing=True)
-    # intermediate_result(altitudes=[900, 1200], massif_names=None)
-    # intermediate_result(ALL_ALTITUDES_WITHOUT_NAN)
-    # intermediate_result(paper_altitudes)
-    # minor_result(altitude=900)
-    # intermediate_result(altitudes=[1500, 1800], massif_names=['Chartreuse'],
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle,
-    #                                          ConfidenceIntervalMethodFromExtremes.ci_bayes],
-    #                     non_stationary_uncertainty=[True])
-    # intermediate_result(altitudes=[1500, 1800], massif_names=None,
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle],
-    #                     non_stationary_uncertainty=[False])
-    # intermediate_result(altitudes=[300, 600, 900, 1200, 1500, 1800], massif_names=None,
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle],
-    #                     non_stationary_uncertainty=[False])
-    # intermediate_result(altitudes=[300, 600, 900, 1200, 1500, 1800, 2100, 2400, 2700], massif_names=None,
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle,
-    #                                          ConfidenceIntervalMethodFromExtremes.ci_bayes],
-    #                     non_stationary_uncertainty=[False, True])
-    # intermediate_result(altitudes=[300, 600, 900], massif_names=None,
-    #                     uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle],
-    #                     non_stationary_uncertainty=[False, True])

projects/exceeding_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py → projects/exceeding_snow_loads/section_results/main_shape_repartition.py

 from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
-from projects.exceeding_snow_loads.check_mle_convergence_for_trends.shape.study_visualizer_for_shape_repartition import \
+from extreme_trend_test.visualizers.study_visualizer_for_shape_repartition import \
     StudyVisualizerForShape
-from projects.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer
-from projects.exceeding_snow_loads.paper_utils import paper_altitudes
+from extreme_trend_test.visualizers.utils import load_altitude_to_visualizer
 
 
 def main_shape_repartition(altitudes, massif_names=None,

projects/exceeding_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py → projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py

 import matplotlib.pyplot as plt
 
-from projects.exceeding_snow_loads.paper_utils import ModelSubsetForUncertainty, dpi_paper1_figure
 from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
     ConfidenceIntervalMethodFromExtremes
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import ModelSubsetForUncertainty
 
 
 def plot_diagnosis_risk(altitude_to_visualizer):

projects/exceeding_snow_loads/result_trends_and_return_levels/plot_selection_curves.py → projects/exceeding_snow_loads/section_results/plot_selection_curves.py

 from typing import Dict
-from collections import Counter
 import matplotlib.pyplot as plt
 
-from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy
 from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends
-from itertools import chain
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends
+
 
 def permute(l, permutation):
     # permutation = [i//2  if i % 2 == 0 else 4 + i //2 for i in range(8)]

projects/exceeding_snow_loads/result_trends_and_return_levels/plot_trend_curves.py → projects/exceeding_snow_loads/section_results/plot_trend_curves.py

@@ -3,8 +3,8 @@ import matplotlib.pyplot as plt
 
 from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy
 from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \
     StudyVisualizerForNonStationaryTrends
 
 

projects/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py → projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py

@@ -6,9 +6,9 @@ import numpy as np
 from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_ALTITUDES, \
     YEAR_OF_INTEREST_FOR_RETURN_LEVEL
 from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy, filled_marker_legend_list2
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
-    StudyVisualizerForNonStationaryTrends
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \
+    StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty
 from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
     AbstractExtractEurocodeReturnLevel
 from experiment.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region

projects/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py → projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py

@@ -2,9 +2,9 @@ from typing import Dict
 import matplotlib.pyplot as plt
 import numpy as np
 
-from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_ALTITUDES
-from projects.exceeding_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
-from projects.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.eurocode_data.utils import EUROCODE_ALTITUDES
+from projects.exceeding_snow_loads.utils import dpi_paper1_figure
+from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \
     StudyVisualizerForNonStationaryTrends
 from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import ci_method_to_color, \
     ci_method_to_label, ConfidenceIntervalMethodFromExtremes

projects/exceeding_snow_loads/paper_utils.py → projects/exceeding_snow_loads/utils.py

@@ -24,11 +24,3 @@ NON_STATIONARY_TREND_TEST_PAPER = [GumbelVersusGumbel,
                                    GevLocationAgainstGumbel, GevScaleAgainstGumbel,
                                    GevLocationAndScaleTrendTestAgainstGumbel]
 
-
-
-class ModelSubsetForUncertainty(Enum):
-    stationary_gumbel = 0
-    stationary_gumbel_and_gev = 1
-    non_stationary_gumbel = 2
-    non_stationary_gumbel_and_gev = 3
-    stationary_gev = 4

test/test_experiment/test_trend_analysis.py

 import unittest
 
-from projects.exceeding_snow_loads.paper_utils import NON_STATIONARY_TREND_TEST_PAPER
+from projects.exceeding_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER
 
 
 class TestTrendAnalysis(unittest.TestCase):