From e1843e14a3d81d14572d648c4444cbcd29b1f352 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Fri, 7 Feb 2020 15:48:24 +0100
Subject: [PATCH] [paper 1] refactor some string for the plot. create folder
papers. move folders
---
.../eurocode_data/main_eurocode_drawing.py | 308 +++++++++---------
.../adamont_data/ensemble_simulation.py | 1 +
.../main_study_visualizer.py | 2 +-
.../study_visualization/study_visualizer.py | 17 +-
.../abstract_gev_trend_test.py | 4 +-
experiment/utils.py | 13 -
.../__init__.py | 0
.../contrasting_snow_loads}/__init__.py | 0
...tive_change_in_maxima_at_fixed_altitude.py | 4 +-
.../exceeding_snow_loads}/__init__.py | 0
.../__init__.py | 0
.../gelman_convergence_test.py | 0
.../main_bayesian_mcmc.py | 2 +-
.../main_gelman_convergence_test.py | 4 +-
.../__init__.py | 0
.../qqplot}/__init__.py | 0
.../qqplot/main_qqplot_for_big_shapes.py | 2 +-
.../qqplot/plot_qqplot.py | 4 +-
.../shape}/__init__.py | 0
.../shape/main_shape_repartition.py | 4 +-
.../study_visualizer_for_shape_repartition.py | 2 +-
.../without_maximum}/__init__.py | 0
.../main_fit_without_maximum.py | 2 +-
...study_visualizer_for_fit_witout_maximum.py | 2 +-
.../exceeding_snow_loads/data}/__init__.py | 0
.../data/main_eurocode_plot.py | 0
.../data/main_example_swe_total_plot.py | 2 +-
.../__init__.py | 0
.../crocus_study_comparison_with_eurocode.py | 0
.../main_comparison_with_eurocode_examples.py | 4 +-
.../main_comparison_with_eurocode_global.py | 4 +-
...in_spatio_temporal_density_wrt_altitude.py | 4 +-
.../__init__.py | 0
.../main2_choice_to_not_use_starting_years.py | 2 +-
...main3_non_stationary_strength_evolution.py | 2 +-
..._spatial_altitude_starting_years_impact.py | 2 +-
...n4_common_spatial_starting_years_impact.py | 2 +-
.../main4_individual_starting_years_impact.py | 2 +-
.../paper1_old}/__init__.py | 0
.../paper1_old/poster_EVAN2019}/__init__.py | 0
.../poster_EVAN2019/main_poster_EVAN2019.py | 2 +-
.../shape_prior_check}/__init__.py | 0
.../analyse_shape_from_some_experiment.py | 0
.../shape_prior_check/hist_values_shape.png | Bin
.../shape_from_some_experiment.txt | 0
.../shape_prior_check/some_experiment_EVAN.py | 2 +-
.../exceeding_snow_loads}/paper1_old/utils.py | 0
.../paper1_old/validations}/__init__.py | 0
.../main0_comparison_with_observations.py | 0
.../main1_good_stationary_gev_fit.py | 0
.../exceeding_snow_loads}/paper_main_utils.py | 2 +-
.../exceeding_snow_loads}/paper_utils.py | 0
.../__init__.py | 0
.../main_result_trends_and_return_levels.py | 19 +-
.../plot_diagnosis_risk.py | 2 +-
.../plot_trend_curves.py | 4 +-
.../plot_uncertainty_curves.py | 4 +-
.../plot_uncertainty_histogram.py | 4 +-
...dy_visualizer_for_non_stationary_trends.py | 4 +-
papers/projection_snow_load/__init__.py | 0
...ence_between_reanalysis_and_simulations.py | 0
61 files changed, 215 insertions(+), 223 deletions(-)
delete mode 100644 experiment/utils.py
rename {experiment/paper 2 - contrasting => papers}/__init__.py (100%)
rename {experiment/paper1_old/1 - non stationary model choice => papers/contrasting_snow_loads}/__init__.py (100%)
rename {experiment/paper 2 - contrasting => papers/contrasting_snow_loads}/main_spatial_relative_change_in_maxima_at_fixed_altitude.py (94%)
rename {experiment/paper1_old => papers/exceeding_snow_loads}/__init__.py (100%)
rename {experiment/paper1_old/poster_EVAN2019 => papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py (98%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py (93%)
rename {experiment/paper1_old/poster_EVAN2019/shape_prior_check => papers/exceeding_snow_loads/check_mle_convergence_for_trends}/__init__.py (100%)
rename {experiment/paper1_old/validations => papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py (96%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/qqplot/plot_qqplot.py (95%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/shape/main_shape_repartition.py (90%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py (92%)
rename {experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels => papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py (86%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py (95%)
rename {experiment/paper_past_snow_loads/check_mle_convergence_for_trends => papers/exceeding_snow_loads/data}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/data/main_eurocode_plot.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/data/main_example_swe_total_plot.py (97%)
rename {experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot => papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode}/__init__.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/discussion_data_comparison_with_eurocode/crocus_study_comparison_with_eurocode.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py (94%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py (94%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py (94%)
rename {experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape => papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice}/__init__.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py (93%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py (94%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py (96%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py (96%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py (96%)
rename {experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum => papers/exceeding_snow_loads/paper1_old}/__init__.py (100%)
rename {experiment/paper_past_snow_loads/data => papers/exceeding_snow_loads/paper1_old/poster_EVAN2019}/__init__.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py (99%)
rename {experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode => papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check}/__init__.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/poster_EVAN2019/shape_prior_check/analyse_shape_from_some_experiment.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/poster_EVAN2019/shape_prior_check/hist_values_shape.png (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/poster_EVAN2019/shape_prior_check/shape_from_some_experiment.txt (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py (95%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/utils.py (100%)
rename {experiment/paper_past_snow_loads/result_trends_and_return_levels => papers/exceeding_snow_loads/paper1_old/validations}/__init__.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/validations/main0_comparison_with_observations.py (100%)
rename {experiment => papers/exceeding_snow_loads}/paper1_old/validations/main1_good_stationary_gev_fit.py (100%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/paper_main_utils.py (93%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/paper_utils.py (100%)
create mode 100644 papers/exceeding_snow_loads/result_trends_and_return_levels/__init__.py
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/result_trends_and_return_levels/main_result_trends_and_return_levels.py (84%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/result_trends_and_return_levels/plot_diagnosis_risk.py (93%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/result_trends_and_return_levels/plot_trend_curves.py (96%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/result_trends_and_return_levels/plot_uncertainty_curves.py (98%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/result_trends_and_return_levels/plot_uncertainty_histogram.py (94%)
rename {experiment/paper_past_snow_loads => papers/exceeding_snow_loads}/study_visualizer_for_non_stationary_trends.py (99%)
create mode 100644 papers/projection_snow_load/__init__.py
rename {experiment/paper 3 => papers/projection_snow_load}/main_difference_between_reanalysis_and_simulations.py (100%)
diff --git a/experiment/eurocode_data/main_eurocode_drawing.py b/experiment/eurocode_data/main_eurocode_drawing.py
index ca616dcd..e1c373f9 100644
--- a/experiment/eurocode_data/main_eurocode_drawing.py
+++ b/experiment/eurocode_data/main_eurocode_drawing.py
@@ -1,154 +1,154 @@
-import time
-import os.path as op
-import matplotlib.pyplot as plt
-from collections import OrderedDict
-
-from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
- StudyVisualizer
-from extreme_fit.model.result_from_model_fit.result_from_extremes.eurocode_return_level_uncertainties import \
- ConfidenceIntervalMethodFromExtremes
-from experiment.paper_past_snow_loads.result_trends_and_return_levels.plot_uncertainty_curves import \
- plot_uncertainty_massifs, get_model_name
-from experiment.eurocode_data.massif_name_to_departement import MASSIF_NAMES_ALPS
-from experiment.eurocode_data.utils import EUROCODE_ALTITUDES
-from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days, CrocusSweTotal
-from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.altitude_hypercube_visualizer import \
- AltitudeHypercubeVisualizer
-from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.utils_hypercube import \
- load_altitude_visualizer
-from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \
- NonStationaryLocationAndScaleTemporalModel
-
-# Model class
-import matplotlib as mpl
-
-from root_utils import VERSION_TIME
-
-mpl.rcParams['text.usetex'] = True
-mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
-
-
-def massif_name_to_ordered_return_level_uncertainties(model_class, last_year_for_the_data, altitudes, massif_names,
- uncertainty_methods, temporal_covariate):
- # Load model name
- model_name = get_model_name(model_class)
- # Load altitude visualizer
- altitude_visualizer = load_altitude_visualizer(AltitudeHypercubeVisualizer, altitudes=altitudes,
- last_starting_year=None, nb_data_reduced_for_speed=False,
- only_first_one=False, save_to_file=False,
- exact_starting_year=1958,
- first_starting_year=None,
- study_classes=[CrocusSwe3Days, CrocusSweTotal][1:],
- trend_test_class=None) # type: AltitudeHypercubeVisualizer
- # Loop on the data
- assert isinstance(altitude_visualizer.tuple_to_study_visualizer, OrderedDict)
- massif_name_to_ordered_eurocode_level_uncertainty = {
- massif_name: {ci_method: [] for ci_method in uncertainty_methods} for massif_name in massif_names}
- for altitude, visualizer in altitude_visualizer.tuple_to_study_visualizer.items():
- print('{} processing altitude = {} '.format(model_name, altitude))
- for ci_method in uncertainty_methods:
- d = visualizer.massif_name_to_altitude_and_eurocode_level_uncertainty(model_class, last_year_for_the_data,
- massif_names, ci_method,
- temporal_covariate)
- # Append the altitude one by one
- for massif_name, return_level_uncertainty in d.items():
- massif_name_to_ordered_eurocode_level_uncertainty[massif_name][ci_method].append(
- return_level_uncertainty)
- return {model_name: massif_name_to_ordered_eurocode_level_uncertainty}
-
-
-def plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods):
- model_name_to_massif_name_to_ordered_return_level = {}
- for model_class, last_year_for_the_data in model_class_and_last_year:
- start = time.time()
- model_name_to_massif_name_to_ordered_return_level.update(
- massif_name_to_ordered_return_level_uncertainties(model_class, last_year_for_the_data, altitudes,
- massif_names, uncertainty_methods, temporal_covariate))
- duration = time.time() - start
- print('Duration:', model_class, duration)
- # Transform the dictionary into the desired format
- massif_name_to_model_name_to_ordered_return_level_uncertainties = {}
- for massif_name in massif_names:
- d2 = {model_name: model_name_to_massif_name_to_ordered_return_level[model_name][massif_name] for model_name in
- model_name_to_massif_name_to_ordered_return_level.keys()}
- massif_name_to_model_name_to_ordered_return_level_uncertainties[massif_name] = d2
- # Plot graph
- plot_uncertainty_massifs(
- massif_name_to_model_name_to_ordered_return_level_uncertainties, nb_massif_names=len(massif_names),
- nb_model_names=len(model_class_and_last_year))
- if show:
- plt.show()
- else:
- massif_names_str = '_'.join(massif_names)
- model_names_str = '_'.join(
- [model_name for model_name in model_name_to_massif_name_to_ordered_return_level.keys()])
- filename = op.join(VERSION_TIME, model_names_str + '_' + massif_names_str)
- StudyVisualizer.savefig_in_results(filename)
-
-
-def main_drawing():
- fast_plot = [True, False][0]
- temporal_covariate = 2017
- # Select parameters
- massif_names = MASSIF_NAMES_ALPS[:]
- model_class_and_last_year = [
- (StationaryTemporalModel, 2017),
- (NonStationaryLocationAndScaleTemporalModel, 2017),
- # Add the temperature here
- ][:]
- altitudes = EUROCODE_ALTITUDES[:]
- uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
- ConfidenceIntervalMethodFromExtremes.ci_mle]
- show = False
-
- if fast_plot:
- show = True
- model_class_and_last_year = model_class_and_last_year[:]
- altitudes = altitudes[-2:]
- # altitudes = altitudes[:]
- massif_names = massif_names[:1]
- uncertainty_methods = uncertainty_methods[:]
-
- plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
-
-
-# Create 5 main plots
-def main_5_drawings():
- model_class_and_last_year = [
- (StationaryTemporalModel, 2017),
- (NonStationaryLocationAndScaleTemporalModel, 2017),
- # Add the temperature here
- ][:1]
- altitudes = EUROCODE_ALTITUDES[:]
- uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
- ConfidenceIntervalMethodFromExtremes.ci_mle]
- show = False
- massif_names = MASSIF_NAMES_ALPS[:]
- temporal_covariate = 2017
- m = 4
- n = (23 // m) + 1
- for i in list(range(n))[:]:
- massif_names = MASSIF_NAMES_ALPS[m * i: m * (i+1)]
- print(massif_names)
- plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
-
-
-def main_3_massif_of_interest():
- massif_names = ['Parpaillon', 'Chartreuse', 'Maurienne'][1:]
- model_class_and_last_year = [
- (StationaryTemporalModel, 2017),
- (NonStationaryLocationAndScaleTemporalModel, 2017),
- # Add the temperature here
- ][:]
- altitudes = EUROCODE_ALTITUDES[1:]
- uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
- ConfidenceIntervalMethodFromExtremes.ci_mle][:]
- temporal_covariate = 2017
- show = False
- plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
-
-
-if __name__ == '__main__':
- # main_drawing()
- # main_5_drawings()
- main_3_massif_of_interest()
\ No newline at end of file
+# import time
+# import os.path as op
+# import matplotlib.pyplot as plt
+# from collections import OrderedDict
+#
+# from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
+# StudyVisualizer
+# from extreme_fit.model.result_from_model_fit.result_from_extremes.eurocode_return_level_uncertainties import \
+# ConfidenceIntervalMethodFromExtremes
+# from papers.exceeding_snow_loads.result_trends_and_return_levels.plot_uncertainty_curves import \
+# plot_uncertainty_massifs
+# from experiment.eurocode_data.massif_name_to_departement import MASSIF_NAMES_ALPS
+# from experiment.eurocode_data.utils import EUROCODE_ALTITUDES
+# from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days, CrocusSweTotal
+# from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.altitude_hypercube_visualizer import \
+# AltitudeHypercubeVisualizer
+# from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.utils_hypercube import \
+# load_altitude_visualizer
+# from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \
+# NonStationaryLocationAndScaleTemporalModel
+#
+# # Model class
+# import matplotlib as mpl
+#
+# from root_utils import VERSION_TIME
+#
+# mpl.rcParams['text.usetex'] = True
+# mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
+#
+#
+# def massif_name_to_ordered_return_level_uncertainties(model_class, last_year_for_the_data, altitudes, massif_names,
+# uncertainty_methods, temporal_covariate):
+# # Load model name
+# model_name = get_model_name(model_class)
+# # Load altitude visualizer
+# altitude_visualizer = load_altitude_visualizer(AltitudeHypercubeVisualizer, altitudes=altitudes,
+# last_starting_year=None, nb_data_reduced_for_speed=False,
+# only_first_one=False, save_to_file=False,
+# exact_starting_year=1958,
+# first_starting_year=None,
+# study_classes=[CrocusSwe3Days, CrocusSweTotal][1:],
+# trend_test_class=None) # type: AltitudeHypercubeVisualizer
+# # Loop on the data
+# assert isinstance(altitude_visualizer.tuple_to_study_visualizer, OrderedDict)
+# massif_name_to_ordered_eurocode_level_uncertainty = {
+# massif_name: {ci_method: [] for ci_method in uncertainty_methods} for massif_name in massif_names}
+# for altitude, visualizer in altitude_visualizer.tuple_to_study_visualizer.items():
+# print('{} processing altitude = {} '.format(model_name, altitude))
+# for ci_method in uncertainty_methods:
+# d = visualizer.massif_name_to_altitude_and_eurocode_level_uncertainty(model_class, last_year_for_the_data,
+# massif_names, ci_method,
+# temporal_covariate)
+# # Append the altitude one by one
+# for massif_name, return_level_uncertainty in d.items():
+# massif_name_to_ordered_eurocode_level_uncertainty[massif_name][ci_method].append(
+# return_level_uncertainty)
+# return {model_name: massif_name_to_ordered_eurocode_level_uncertainty}
+#
+#
+# def plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods):
+# model_name_to_massif_name_to_ordered_return_level = {}
+# for model_class, last_year_for_the_data in model_class_and_last_year:
+# start = time.time()
+# model_name_to_massif_name_to_ordered_return_level.update(
+# massif_name_to_ordered_return_level_uncertainties(model_class, last_year_for_the_data, altitudes,
+# massif_names, uncertainty_methods, temporal_covariate))
+# duration = time.time() - start
+# print('Duration:', model_class, duration)
+# # Transform the dictionary into the desired format
+# massif_name_to_model_name_to_ordered_return_level_uncertainties = {}
+# for massif_name in massif_names:
+# d2 = {model_name: model_name_to_massif_name_to_ordered_return_level[model_name][massif_name] for model_name in
+# model_name_to_massif_name_to_ordered_return_level.keys()}
+# massif_name_to_model_name_to_ordered_return_level_uncertainties[massif_name] = d2
+# # Plot graph
+# plot_uncertainty_massifs(
+# massif_name_to_model_name_to_ordered_return_level_uncertainties, nb_massif_names=len(massif_names),
+# nb_model_names=len(model_class_and_last_year))
+# if show:
+# plt.show()
+# else:
+# massif_names_str = '_'.join(massif_names)
+# model_names_str = '_'.join(
+# [model_name for model_name in model_name_to_massif_name_to_ordered_return_level.keys()])
+# filename = op.join(VERSION_TIME, model_names_str + '_' + massif_names_str)
+# StudyVisualizer.savefig_in_results(filename)
+#
+#
+# def main_drawing():
+# fast_plot = [True, False][0]
+# temporal_covariate = 2017
+# # Select parameters
+# massif_names = MASSIF_NAMES_ALPS[:]
+# model_class_and_last_year = [
+# (StationaryTemporalModel, 2017),
+# (NonStationaryLocationAndScaleTemporalModel, 2017),
+# # Add the temperature here
+# ][:]
+# altitudes = EUROCODE_ALTITUDES[:]
+# uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
+# ConfidenceIntervalMethodFromExtremes.ci_mle]
+# show = False
+#
+# if fast_plot:
+# show = True
+# model_class_and_last_year = model_class_and_last_year[:]
+# altitudes = altitudes[-2:]
+# # altitudes = altitudes[:]
+# massif_names = massif_names[:1]
+# uncertainty_methods = uncertainty_methods[:]
+#
+# plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
+#
+#
+# # Create 5 main plots
+# def main_5_drawings():
+# model_class_and_last_year = [
+# (StationaryTemporalModel, 2017),
+# (NonStationaryLocationAndScaleTemporalModel, 2017),
+# # Add the temperature here
+# ][:1]
+# altitudes = EUROCODE_ALTITUDES[:]
+# uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
+# ConfidenceIntervalMethodFromExtremes.ci_mle]
+# show = False
+# massif_names = MASSIF_NAMES_ALPS[:]
+# temporal_covariate = 2017
+# m = 4
+# n = (23 // m) + 1
+# for i in list(range(n))[:]:
+# massif_names = MASSIF_NAMES_ALPS[m * i: m * (i+1)]
+# print(massif_names)
+# plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
+#
+#
+# def main_3_massif_of_interest():
+# massif_names = ['Parpaillon', 'Chartreuse', 'Maurienne'][1:]
+# model_class_and_last_year = [
+# (StationaryTemporalModel, 2017),
+# (NonStationaryLocationAndScaleTemporalModel, 2017),
+# # Add the temperature here
+# ][:]
+# altitudes = EUROCODE_ALTITUDES[1:]
+# uncertainty_methods = [ConfidenceIntervalMethodFromExtremes.my_bayes,
+# ConfidenceIntervalMethodFromExtremes.ci_mle][:]
+# temporal_covariate = 2017
+# show = False
+# plot_ci_graphs(altitudes, massif_names, model_class_and_last_year, show, temporal_covariate, uncertainty_methods)
+#
+#
+# if __name__ == '__main__':
+# # main_drawing()
+# # main_5_drawings()
+# main_3_massif_of_interest()
\ No newline at end of file
diff --git a/experiment/meteo_france_data/adamont_data/ensemble_simulation.py b/experiment/meteo_france_data/adamont_data/ensemble_simulation.py
index bdd1b692..336df9ea 100644
--- a/experiment/meteo_france_data/adamont_data/ensemble_simulation.py
+++ b/experiment/meteo_france_data/adamont_data/ensemble_simulation.py
@@ -27,6 +27,7 @@ class EnsembleSimulation(object):
# Load simulations
# todo: so far i am using one ensemble member
+ print('single ensemble member', self.nc_files[0])
self.simulations = [SingleSimulation(nc_path, self.parameter,
self.first_winter_required_for_histo,
self.last_year_for_histo) for nc_path in self.nc_paths][:1]
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
index 102dedd5..e1843a71 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
@@ -3,7 +3,7 @@ from typing import List
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
StudyVisualizer
-from experiment.paper_past_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from papers.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
CrocusDifferenceSnowLoad, \
CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \
CrocusSnowDepthDifference, CrocusSnowDepthAtMaxofSwe
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
index a346d59a..6891acfb 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
@@ -21,7 +21,6 @@ from experiment.trend_analysis.non_stationary_trends import \
ConditionalIndedendenceLocationTrendTest, MaxStableLocationTrendTest, IndependenceLocationTrendTest
from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
from experiment.trend_analysis.univariate_test.univariate_test_results import compute_gev_change_point_test_results
-from experiment.utils import average_smoothing_with_sliding_window
from extreme_fit.distribution.abstract_params import AbstractParams
from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
FullEstimatorInASingleStepWithSmoothMargin
@@ -699,7 +698,7 @@ class StudyVisualizer(VisualizationParameters):
tuples_x_y = [(year, np.mean(data[:, massif_id])) for year, data in
self.study.year_to_daily_time_serie_array.items()]
x, y = list(zip(*tuples_x_y))
- x, y = average_smoothing_with_sliding_window(x, y, window_size_for_smoothing=self.window_size_for_smoothing)
+ x, y = self.average_smoothing_with_sliding_window(x, y, window_size_for_smoothing=self.window_size_for_smoothing)
ax.plot(x, y, color=color_mean)
ax.set_ylabel('mean'.format(self.window_size_for_smoothing), color=color_mean)
massif_name = self.study.study_massif_names[massif_id]
@@ -713,7 +712,7 @@ class StudyVisualizer(VisualizationParameters):
tuples_x_y = [(year, annual_maxima[massif_id]) for year, annual_maxima in
self.study.year_to_annual_maxima.items()]
x, y = list(zip(*tuples_x_y))
- x, y = average_smoothing_with_sliding_window(x, y, window_size_for_smoothing=self.window_size_for_smoothing)
+ x, y = self.average_smoothing_with_sliding_window(x, y, window_size_for_smoothing=self.window_size_for_smoothing)
self.massif_id_to_smooth_maxima[massif_id] = (x, y)
return self.massif_id_to_smooth_maxima[massif_id]
@@ -976,3 +975,15 @@ class StudyVisualizer(VisualizationParameters):
threshold=threshold).gpd_params.summary_serie
for massif_name in self.study.study_massif_names}
return pd.DataFrame(massif_to_gev_mle, columns=self.study.study_massif_names)
+
+ @staticmethod
+ def average_smoothing_with_sliding_window(x, y, window_size_for_smoothing):
+ # Average on windows of size 2*M+1 (M elements on each side)
+ kernel = np.ones(window_size_for_smoothing) / window_size_for_smoothing
+ y = np.convolve(y, kernel, mode='valid')
+ assert window_size_for_smoothing % 2 == 1
+ if window_size_for_smoothing > 1:
+ nb_to_delete = int(window_size_for_smoothing // 2)
+ x = np.array(x)[nb_to_delete:-nb_to_delete]
+ assert len(x) == len(y), "{} vs {}".format(len(x), len(y))
+ return x, y
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py b/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py
index ba647019..e3084eff 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py
+++ b/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py
@@ -226,8 +226,8 @@ class AbstractGevTrendTest(AbstractUnivariateTest):
ax.plot(standard_gumbel_quantiles, constrained_empirical_quantiles, 'x', label='Stationary Gumbel model $\mathcal{M}_0$')
ax.plot(standard_gumbel_quantiles, unconstrained_empirical_quantiles, linestyle='None',
label='Selected model $\mathcal{M}_N$', **marker)
- ax.set_xlabel("Standard Gumbel quantiles", fontsize=size)
- ax.set_ylabel("Empirical quantiles", fontsize=size)
+ ax.set_xlabel("Standard Gumbel quantile", fontsize=size)
+ ax.set_ylabel("Standard Empirical quantile", fontsize=size)
ax.legend(loc='upper left', prop={'size': 10})
ax.set_xlim(ax_lim)
ax.set_ylim(ax_lim)
diff --git a/experiment/utils.py b/experiment/utils.py
deleted file mode 100644
index fe3083f5..00000000
--- a/experiment/utils.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import numpy as np
-
-
-def average_smoothing_with_sliding_window(x, y, window_size_for_smoothing):
- # Average on windows of size 2*M+1 (M elements on each side)
- kernel = np.ones(window_size_for_smoothing) / window_size_for_smoothing
- y = np.convolve(y, kernel, mode='valid')
- assert window_size_for_smoothing % 2 == 1
- if window_size_for_smoothing > 1:
- nb_to_delete = int(window_size_for_smoothing // 2)
- x = np.array(x)[nb_to_delete:-nb_to_delete]
- assert len(x) == len(y), "{} vs {}".format(len(x), len(y))
- return x, y
diff --git a/experiment/paper 2 - contrasting/__init__.py b/papers/__init__.py
similarity index 100%
rename from experiment/paper 2 - contrasting/__init__.py
rename to papers/__init__.py
diff --git a/experiment/paper1_old/1 - non stationary model choice/__init__.py b/papers/contrasting_snow_loads/__init__.py
similarity index 100%
rename from experiment/paper1_old/1 - non stationary model choice/__init__.py
rename to papers/contrasting_snow_loads/__init__.py
diff --git a/experiment/paper 2 - contrasting/main_spatial_relative_change_in_maxima_at_fixed_altitude.py b/papers/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py
similarity index 94%
rename from experiment/paper 2 - contrasting/main_spatial_relative_change_in_maxima_at_fixed_altitude.py
rename to papers/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py
index 296cbfdb..4451ab32 100644
--- a/experiment/paper 2 - contrasting/main_spatial_relative_change_in_maxima_at_fixed_altitude.py
+++ b/papers/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py
@@ -9,11 +9,11 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
StudyVisualizer
import matplotlib.pyplot as plt
-from experiment.paper_past_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
CrocusDifferenceSnowLoad, \
CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \
CrocusSnowDepthAtMaxofSwe, CrocusSnowDepthDifference
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
def test():
diff --git a/experiment/paper1_old/__init__.py b/papers/exceeding_snow_loads/__init__.py
similarity index 100%
rename from experiment/paper1_old/__init__.py
rename to papers/exceeding_snow_loads/__init__.py
diff --git a/experiment/paper1_old/poster_EVAN2019/__init__.py b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py
similarity index 100%
rename from experiment/paper1_old/poster_EVAN2019/__init__.py
rename to papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py
diff --git a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
rename to papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
diff --git a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
similarity index 98%
rename from experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
rename to papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
index fffe27da..cc0a2b3e 100644
--- a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
+++ b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
@@ -4,7 +4,7 @@ import seaborn as sns
import matplotlib.pyplot as plt
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days, CrocusSnowLoadTotal
from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
-from experiment.paper_past_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \
+from experiment.exceeding_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \
compute_gelman_score
from experiment.trend_analysis.univariate_test.utils import load_temporal_coordinates_and_dataset, \
fitted_linear_margin_estimator
diff --git a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py
similarity index 93%
rename from experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py
rename to papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py
index 53466706..bb4a8cf8 100644
--- a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py
+++ b/papers/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py
@@ -1,7 +1,7 @@
import pandas as pd
-from experiment.paper_past_snow_loads.paper_main_utils import load_altitude_to_visualizer
-from experiment.paper_past_snow_loads.paper_utils import paper_altitudes, paper_study_classes
+from experiment.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer
+from experiment.exceeding_snow_loads.paper_utils import paper_altitudes, paper_study_classes
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel
from root_utils import get_display_name_from_object_type
diff --git a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/__init__.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/__init__.py
similarity index 100%
rename from experiment/paper1_old/poster_EVAN2019/shape_prior_check/__init__.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/__init__.py
diff --git a/experiment/paper1_old/validations/__init__.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/__init__.py
similarity index 100%
rename from experiment/paper1_old/validations/__init__.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/__init__.py
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py
similarity index 96%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py
index 565c2378..330cef7a 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/main_qqplot_for_big_shapes.py
@@ -3,7 +3,7 @@ from typing import Dict
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py
similarity index 95%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py
index 1d2d859f..5ff62713 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/qqplot/plot_qqplot.py
@@ -8,8 +8,8 @@ from matplotlib.ticker import PercentFormatter
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN
-from experiment.paper_past_snow_loads.data.main_example_swe_total_plot import tuples_for_examples_paper1
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.data.main_example_swe_total_plot import tuples_for_examples_paper1
+from experiment.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from extreme_fit.distribution.gev.gev_params import GevParams
diff --git a/experiment/paper_past_snow_loads/__init__.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/__init__.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/__init__.py
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py
similarity index 90%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py
index d52bde11..f12726be 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/main_shape_repartition.py
@@ -1,7 +1,7 @@
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
-from experiment.paper_past_snow_loads.check_mle_convergence_for_trends.shape.study_visualizer_for_shape_repartition import \
+from experiment.exceeding_snow_loads.check_mle_convergence_for_trends.shape.study_visualizer_for_shape_repartition import \
StudyVisualizerForShape
-from experiment.paper_past_snow_loads.paper_main_utils import load_altitude_to_visualizer
+from experiment.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer
def main_shape_repartition(altitudes, massif_names=None,
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py
similarity index 92%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py
index bc0f04da..56de999a 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/shape/study_visualizer_for_shape_repartition.py
@@ -3,7 +3,7 @@ from cached_property import cached_property
from experiment.meteo_france_data.plot.create_shifted_cmap import get_shifted_map
from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from experiment.trend_analysis.abstract_score import MeanScore
diff --git a/experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/__init__.py
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py
similarity index 86%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py
index 7184ee57..3326bcbc 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/main_fit_without_maximum.py
@@ -3,7 +3,7 @@ from typing import Dict
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN
-from experiment.paper_past_snow_loads.check_mle_convergence_for_trends.without_maximum.study_visualizer_for_fit_witout_maximum import \
+from experiment.exceeding_snow_loads.check_mle_convergence_for_trends.without_maximum.study_visualizer_for_fit_witout_maximum import \
StudyVisualizerForFitWithoutMaximum
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py
similarity index 95%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py
rename to papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py
index 898d5840..6a929d1f 100644
--- a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py
+++ b/papers/exceeding_snow_loads/check_mle_convergence_for_trends/without_maximum/study_visualizer_for_fit_witout_maximum.py
@@ -6,7 +6,7 @@ from cached_property import cached_property
from experiment.meteo_france_data.plot.create_shifted_cmap import get_shifted_map
from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from experiment.trend_analysis.abstract_score import MeanScore
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/__init__.py b/papers/exceeding_snow_loads/data/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/__init__.py
rename to papers/exceeding_snow_loads/data/__init__.py
diff --git a/experiment/paper_past_snow_loads/data/main_eurocode_plot.py b/papers/exceeding_snow_loads/data/main_eurocode_plot.py
similarity index 100%
rename from experiment/paper_past_snow_loads/data/main_eurocode_plot.py
rename to papers/exceeding_snow_loads/data/main_eurocode_plot.py
diff --git a/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py b/papers/exceeding_snow_loads/data/main_example_swe_total_plot.py
similarity index 97%
rename from experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py
rename to papers/exceeding_snow_loads/data/main_example_swe_total_plot.py
index f8560edf..f654e168 100644
--- a/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py
+++ b/papers/exceeding_snow_loads/data/main_example_swe_total_plot.py
@@ -5,7 +5,7 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
StudyVisualizer
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
def tuples_for_examples_paper1(examples_for_the_paper=True):
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/__init__.py b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/qqplot/__init__.py
rename to papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/__init__.py
diff --git a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/crocus_study_comparison_with_eurocode.py b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/crocus_study_comparison_with_eurocode.py
similarity index 100%
rename from experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/crocus_study_comparison_with_eurocode.py
rename to papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/crocus_study_comparison_with_eurocode.py
diff --git a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py
similarity index 94%
rename from experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py
rename to papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py
index b3d04911..fefd645f 100644
--- a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py
+++ b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_examples.py
@@ -6,11 +6,11 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
StudyVisualizer
import matplotlib.pyplot as plt
-from experiment.paper_past_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
CrocusDifferenceSnowLoad, \
CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \
CrocusSnowDepthAtMaxofSwe, CrocusSnowDepthDifference
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
def max_graph_annual_maxima_comparison():
diff --git a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py
similarity index 94%
rename from experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py
rename to papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py
index 22b5593b..6a834204 100644
--- a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py
+++ b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_comparison_with_eurocode_global.py
@@ -6,11 +6,11 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
StudyVisualizer
import matplotlib.pyplot as plt
-from experiment.paper_past_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
CrocusDifferenceSnowLoad, \
CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \
CrocusSnowDepthAtMaxofSwe, CrocusSnowDepthDifference
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
def max_graph_annual_maxima_comparison():
diff --git a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py
similarity index 94%
rename from experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py
rename to papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py
index cca605ce..0c4dfadc 100644
--- a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py
+++ b/papers/exceeding_snow_loads/discussion_data_comparison_with_eurocode/main_spatio_temporal_density_wrt_altitude.py
@@ -6,11 +6,11 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
StudyVisualizer
import matplotlib.pyplot as plt
-from experiment.paper_past_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
+from experiment.exceeding_snow_loads.discussion_data_comparison_with_eurocode.crocus_study_comparison_with_eurocode import \
CrocusDifferenceSnowLoad, \
CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \
CrocusSnowDepthAtMaxofSwe, CrocusSnowDepthDifference
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure
def density_wrt_altitude():
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/__init__.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/shape/__init__.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/__init__.py
diff --git a/experiment/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py
similarity index 93%
rename from experiment/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py
index 1b557cc5..d6fc5ab3 100644
--- a/experiment/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py
+++ b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main2_choice_to_not_use_starting_years.py
@@ -2,7 +2,7 @@ import time
from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.altitude_year_hypercube_visualizer import \
Altitude_Hypercube_Year_Visualizer
-from experiment.paper1_old.utils import get_full_altitude_visualizer, FULL_ALTITUDES
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer, FULL_ALTITUDES
def main_fast_spatial_repartition():
diff --git a/experiment/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py
similarity index 94%
rename from experiment/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py
index 1f0b6ae1..368008f2 100644
--- a/experiment/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py
+++ b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main3_non_stationary_strength_evolution.py
@@ -9,7 +9,7 @@ from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two
"""
Visualize the 0.99 quantile initial value and its evolution
"""
-from experiment.paper1_old.utils import get_full_altitude_visualizer, FULL_ALTITUDES
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer, FULL_ALTITUDES
def main_fast_spatial_risk_evolution():
diff --git a/experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py
similarity index 96%
rename from experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py
index 20571443..443a0c6a 100644
--- a/experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py
+++ b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_altitude_starting_years_impact.py
@@ -7,7 +7,7 @@ from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two
"""
Visualize the 0.99 quantile initial value and its evolution
"""
-from experiment.paper1_old.utils import get_full_altitude_visualizer, FULL_ALTITUDES
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer, FULL_ALTITUDES
def main_fast_spatial_risk_evolution():
diff --git a/experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py
similarity index 96%
rename from experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py
index ef62be2f..3ad25abd 100644
--- a/experiment/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py
+++ b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_common_spatial_starting_years_impact.py
@@ -7,7 +7,7 @@ from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two
"""
Visualize the 0.99 quantile initial value and its evolution
"""
-from experiment.paper1_old.utils import get_full_altitude_visualizer, FULL_ALTITUDES
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer, FULL_ALTITUDES
def main_fast_spatial_risk_evolution():
diff --git a/experiment/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py
similarity index 96%
rename from experiment/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py
rename to papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py
index 8f952b0c..9a38884f 100644
--- a/experiment/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py
+++ b/papers/exceeding_snow_loads/paper1_old/1 - non stationary model choice/main4_individual_starting_years_impact.py
@@ -7,7 +7,7 @@ from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two
"""
Visualize the 0.99 quantile initial value and its evolution
"""
-from experiment.paper1_old.utils import get_full_altitude_visualizer, FULL_ALTITUDES
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer, FULL_ALTITUDES
def main_fast_spatial_risk_evolution():
diff --git a/experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/__init__.py b/papers/exceeding_snow_loads/paper1_old/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/check_mle_convergence_for_trends/without_maximum/__init__.py
rename to papers/exceeding_snow_loads/paper1_old/__init__.py
diff --git a/experiment/paper_past_snow_loads/data/__init__.py b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/data/__init__.py
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/__init__.py
diff --git a/experiment/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py
similarity index 99%
rename from experiment/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py
index 7670f92b..df96d6bd 100644
--- a/experiment/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py
+++ b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/main_poster_EVAN2019.py
@@ -6,7 +6,7 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter import GevScaleTrendTest, \
GevLocationTrendTest
from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest
-from experiment.paper1_old.utils import get_full_altitude_visualizer
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer
POSTER_ALTITUDES = [900, 1800, 2700]
import matplotlib as mpl
diff --git a/experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/__init__.py b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/discussion_data_comparison_with_eurocode/__init__.py
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/__init__.py
diff --git a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/analyse_shape_from_some_experiment.py b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/analyse_shape_from_some_experiment.py
similarity index 100%
rename from experiment/paper1_old/poster_EVAN2019/shape_prior_check/analyse_shape_from_some_experiment.py
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/analyse_shape_from_some_experiment.py
diff --git a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/hist_values_shape.png b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/hist_values_shape.png
similarity index 100%
rename from experiment/paper1_old/poster_EVAN2019/shape_prior_check/hist_values_shape.png
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/hist_values_shape.png
diff --git a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/shape_from_some_experiment.txt b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/shape_from_some_experiment.txt
similarity index 100%
rename from experiment/paper1_old/poster_EVAN2019/shape_prior_check/shape_from_some_experiment.txt
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/shape_from_some_experiment.txt
diff --git a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py
similarity index 95%
rename from experiment/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py
rename to papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py
index 02d5f8ca..a6a982c3 100644
--- a/experiment/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py
+++ b/papers/exceeding_snow_loads/paper1_old/poster_EVAN2019/shape_prior_check/some_experiment_EVAN.py
@@ -5,7 +5,7 @@ from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one
from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter import GevScaleTrendTest, \
GevLocationTrendTest
from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest
-from experiment.paper1_old.utils import get_full_altitude_visualizer
+from experiment.exceeding_snow_loads.paper1_old import get_full_altitude_visualizer
POSTER_ALTITUDES = [900, 1800, 2700]
import matplotlib as mpl
diff --git a/experiment/paper1_old/utils.py b/papers/exceeding_snow_loads/paper1_old/utils.py
similarity index 100%
rename from experiment/paper1_old/utils.py
rename to papers/exceeding_snow_loads/paper1_old/utils.py
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/__init__.py b/papers/exceeding_snow_loads/paper1_old/validations/__init__.py
similarity index 100%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/__init__.py
rename to papers/exceeding_snow_loads/paper1_old/validations/__init__.py
diff --git a/experiment/paper1_old/validations/main0_comparison_with_observations.py b/papers/exceeding_snow_loads/paper1_old/validations/main0_comparison_with_observations.py
similarity index 100%
rename from experiment/paper1_old/validations/main0_comparison_with_observations.py
rename to papers/exceeding_snow_loads/paper1_old/validations/main0_comparison_with_observations.py
diff --git a/experiment/paper1_old/validations/main1_good_stationary_gev_fit.py b/papers/exceeding_snow_loads/paper1_old/validations/main1_good_stationary_gev_fit.py
similarity index 100%
rename from experiment/paper1_old/validations/main1_good_stationary_gev_fit.py
rename to papers/exceeding_snow_loads/paper1_old/validations/main1_good_stationary_gev_fit.py
diff --git a/experiment/paper_past_snow_loads/paper_main_utils.py b/papers/exceeding_snow_loads/paper_main_utils.py
similarity index 93%
rename from experiment/paper_past_snow_loads/paper_main_utils.py
rename to papers/exceeding_snow_loads/paper_main_utils.py
index 78b7dd19..a4ff6384 100644
--- a/experiment/paper_past_snow_loads/paper_main_utils.py
+++ b/papers/exceeding_snow_loads/paper_main_utils.py
@@ -1,7 +1,7 @@
from collections import OrderedDict
from enum import Enum
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
TemporalMarginFitMethod
diff --git a/experiment/paper_past_snow_loads/paper_utils.py b/papers/exceeding_snow_loads/paper_utils.py
similarity index 100%
rename from experiment/paper_past_snow_loads/paper_utils.py
rename to papers/exceeding_snow_loads/paper_utils.py
diff --git a/papers/exceeding_snow_loads/result_trends_and_return_levels/__init__.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py
similarity index 84%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py
rename to papers/exceeding_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py
index 258c0325..65d14343 100644
--- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py
+++ b/papers/exceeding_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py
@@ -2,20 +2,13 @@ from multiprocessing.pool import Pool
import matplotlib as mpl
-from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoadEurocode, \
- CrocusSnowLoad3Days, CrocusSnowLoad5Days, CrocusSnowLoad7Days
-from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
- ALL_ALTITUDES_WITHOUT_NAN
-from experiment.paper_past_snow_loads.paper_main_utils import load_altitude_to_visualizer
-from experiment.paper_past_snow_loads.paper_utils import paper_study_classes, paper_altitudes, ModelSubsetForUncertainty
-from experiment.paper_past_snow_loads.result_trends_and_return_levels.plot_diagnosis_risk import plot_diagnosis_risk
-from experiment.paper_past_snow_loads.result_trends_and_return_levels.plot_trend_curves import plot_trend_curves, \
- plot_trend_map
-from experiment.paper_past_snow_loads.result_trends_and_return_levels.plot_uncertainty_curves import \
- plot_uncertainty_massifs
-from experiment.paper_past_snow_loads.result_trends_and_return_levels.plot_uncertainty_histogram import \
+from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
+from papers.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer
+from papers.exceeding_snow_loads.paper_utils import paper_study_classes, paper_altitudes
+from papers.exceeding_snow_loads.result_trends_and_return_levels.plot_diagnosis_risk import plot_diagnosis_risk
+from papers.exceeding_snow_loads.result_trends_and_return_levels.plot_uncertainty_histogram import \
plot_uncertainty_histogram
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from papers.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
ConfidenceIntervalMethodFromExtremes
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py
similarity index 93%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py
rename to papers/exceeding_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py
index a6112812..883ad64b 100644
--- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py
+++ b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_diagnosis_risk.py
@@ -1,6 +1,6 @@
import matplotlib.pyplot as plt
-from experiment.paper_past_snow_loads.paper_utils import ModelSubsetForUncertainty, dpi_paper1_figure
+from papers.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
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_trend_curves.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_trend_curves.py
similarity index 96%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_trend_curves.py
rename to papers/exceeding_snow_loads/result_trends_and_return_levels/plot_trend_curves.py
index 382c271f..225345af 100644
--- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_trend_curves.py
+++ b/papers/exceeding_snow_loads/result_trends_and_return_levels/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 experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from papers.exceeding_snow_loads.paper_utils import dpi_paper1_figure
+from papers.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py
similarity index 98%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py
rename to papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py
index 622a282b..674c4f80 100644
--- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py
+++ b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_curves.py
@@ -7,8 +7,8 @@ from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_A
from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy, filled_marker_legend_list
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
SCM_STUDY_CLASS_TO_ABBREVIATION
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from papers.exceeding_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
+from papers.exceeding_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
AbstractExtractEurocodeReturnLevel
diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py
similarity index 94%
rename from experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py
rename to papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py
index 680c7e88..a9a9f95c 100644
--- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py
+++ b/papers/exceeding_snow_loads/result_trends_and_return_levels/plot_uncertainty_histogram.py
@@ -3,8 +3,8 @@ import matplotlib.pyplot as plt
import numpy as np
from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_ALTITUDES
-from experiment.paper_past_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
-from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
+from experiment.exceeding_snow_loads.paper_utils import dpi_paper1_figure, ModelSubsetForUncertainty
+from experiment.exceeding_snow_loads.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
diff --git a/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py b/papers/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
similarity index 99%
rename from experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py
rename to papers/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
index ab2a9c0e..0ea784f8 100644
--- a/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py
+++ b/papers/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
@@ -14,9 +14,9 @@ from experiment.meteo_france_data.scm_models_data.abstract_extended_study import
from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
StudyVisualizer
-from experiment.paper_past_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \
+from experiment.exceeding_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \
compute_gelman_convergence_value
-from experiment.paper_past_snow_loads.paper_utils import ModelSubsetForUncertainty
+from experiment.exceeding_snow_loads.paper_utils import ModelSubsetForUncertainty
from experiment.trend_analysis.abstract_score import MeanScore
from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
diff --git a/papers/projection_snow_load/__init__.py b/papers/projection_snow_load/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/experiment/paper 3/main_difference_between_reanalysis_and_simulations.py b/papers/projection_snow_load/main_difference_between_reanalysis_and_simulations.py
similarity index 100%
rename from experiment/paper 3/main_difference_between_reanalysis_and_simulations.py
rename to papers/projection_snow_load/main_difference_between_reanalysis_and_simulations.py
--
GitLab