From dfc269ef98acbbb9f84d61d28d9e1448c1bc2760 Mon Sep 17 00:00:00 2001 From: Le Roux Erwan <erwan.le-roux@irstea.fr> Date: Wed, 18 Mar 2020 23:27:20 +0100 Subject: [PATCH] [refactor] create folder extreme_data --- {experiment => extreme_data}/__init__.py | 0 .../eurocode_data/__init__.py | 0 .../departement_alpes_francaises.py | 2 +- .../eurocode_data/eurocode_region.py | 2 +- .../massif_name_to_departement.py | 4 ++-- .../eurocode_data/utils.py | 0 .../meteo_france_data/__init__.py | 0 .../adamont_data/__init__.py | 0 .../adamont_data/download_adamont.py | 0 .../adamont_data/ensemble_simulation.py | 2 +- .../adamont_data/single_simulation.py | 2 +- .../scm_models_data/__init__.py | 0 .../abstract_extended_study.py | 2 +- .../scm_models_data/abstract_study.py | 8 ++++---- .../scm_models_data/abstract_variable.py | 0 .../scm_models_data/crocus/__init__.py | 0 .../scm_models_data/crocus/crocus.py | 6 +++--- .../crocus/crocus_variables.py | 2 +- .../scm_models_data/crocus/taline_data.py | 4 ++-- .../scm_models_data/safran/__init__.py | 0 .../scm_models_data/safran/cumulated_study.py | 4 ++-- .../scm_models_data/safran/safran.py | 10 +++++----- .../scm_models_data/safran/safran_variable.py | 2 +- .../scm_models_data/scm_constants.py | 0 .../scm_models_data/visualization/__init__.py | 0 .../visualization/create_shifted_cmap.py | 0 .../visualization/main_study_visualizer.py | 10 +++++----- .../visualization/study_visualizer.py | 6 +++--- .../scm_models_data/visualization/utils.py | 0 .../stations_data/__init__.py | 0 .../stations_data/comparison_analysis.py | 4 ++-- .../comparisons_visualization.py | 6 +++--- .../abstract_margin_function.py | 4 ++-- .../abstract_extract_eurocode_return_level.py | 2 +- .../eurocode_return_level_uncertainties.py | 2 +- .../__init__.py | 0 .../abstract_gev_trend_test.py | 4 ++-- .../trend_test_one_parameter/__init__.py | 0 ...bstract_comparison_non_stationary_model.py | 6 +++--- .../gev_trend_test_one_parameter.py | 4 ++-- .../gumbel_trend_test_one_parameter.py | 4 ++-- .../trend_test_three_parameters/__init__.py | 0 .../gev_trend_test_three_parameters.py | 4 ++-- .../trend_test_two_parameters/__init__.py | 0 .../gev_trend_test_two_parameters.py | 6 +++--- .../gumbel_test_two_parameters.py | 4 ++-- .../visualizers/__init__.py | 0 ...dy_visualizer_for_non_stationary_trends.py | 20 +++++++++---------- .../study_visualizer_for_shape_repartition.py | 6 +++--- .../visualizers/utils.py | 2 +- .../main_bayesian_mcmc.py | 6 +++--- .../main_gelman_convergence_test.py | 4 ++-- .../contrasting_snow_loads/main_result.py | 8 ++++---- ...tive_change_in_maxima_at_fixed_altitude.py | 6 +++--- .../plot_contrasting_trend_curves.py | 6 +++--- .../mixed_distribution_impact.py | 4 ++-- .../qqplot/main_qqplot_for_big_shapes.py | 6 +++--- .../checks/qqplot/plot_qqplot.py | 4 ++-- .../checks/uncertainty_interval_size.py | 4 ++-- .../main_fit_without_maximum.py | 4 ++-- ...study_visualizer_for_fit_witout_maximum.py | 4 ++-- .../presentation/accumulation_in_winter.py | 4 ++-- .../presentation/statistical_model.py | 4 ++-- .../section_data/main_eurocode_plot.py | 8 ++++---- .../main_example_swe_total_plot.py | 6 +++--- .../crocus_study_comparison_with_eurocode.py | 4 ++-- .../main_comparison_with_eurocode_examples.py | 4 ++-- .../main_comparison_with_eurocode_global.py | 4 ++-- ...in_spatio_temporal_density_wrt_altitude.py | 4 ++-- .../main_result_trends_and_return_levels.py | 6 +++--- .../section_results/main_shape_repartition.py | 6 +++--- .../section_results/plot_diagnosis_risk.py | 2 +- .../section_results/plot_selection_curves.py | 6 +++--- .../section_results/plot_trend_curves.py | 6 +++--- .../plot_uncertainty_curves.py | 10 +++++----- .../plot_uncertainty_histogram.py | 4 ++-- projects/exceeding_snow_loads/utils.py | 12 +++++------ ...ence_between_reanalysis_and_simulations.py | 6 +++--- .../__init__.py | 0 .../test_meteo_france_data/__init__.py | 0 .../test_SCM_oriented_data.py | 6 +++--- .../test_meteo_france_data}/test_SCM_study.py | 6 +++--- .../test_gev_temporal_extremes_bayesian.py | 2 +- .../test_gev_temporal_extremes_gumbel.py | 2 +- .../test_gev_temporal_extremes_mle.py | 2 +- test/test_extreme_trend/__init__.py | 0 .../test_extreme_trend.py} | 0 test/test_utils.py | 6 +++--- 88 files changed, 160 insertions(+), 160 deletions(-) rename {experiment => extreme_data}/__init__.py (100%) rename {experiment => extreme_data}/eurocode_data/__init__.py (100%) rename {experiment => extreme_data}/eurocode_data/departement_alpes_francaises.py (93%) rename {experiment => extreme_data}/eurocode_data/eurocode_region.py (97%) rename {experiment => extreme_data}/eurocode_data/massif_name_to_departement.py (93%) rename {experiment => extreme_data}/eurocode_data/utils.py (100%) rename {experiment => extreme_data}/meteo_france_data/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/adamont_data/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/adamont_data/download_adamont.py (100%) rename {experiment => extreme_data}/meteo_france_data/adamont_data/ensemble_simulation.py (97%) rename {experiment => extreme_data}/meteo_france_data/adamont_data/single_simulation.py (96%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/abstract_extended_study.py (97%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/abstract_study.py (98%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/abstract_variable.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/crocus/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/crocus/crocus.py (93%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/crocus/crocus_variables.py (96%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/crocus/taline_data.py (79%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/safran/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/safran/cumulated_study.py (77%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/safran/safran.py (88%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/safran/safran_variable.py (98%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/scm_constants.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/visualization/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/visualization/create_shifted_cmap.py (100%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py (95%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/visualization/study_visualizer.py (99%) rename {experiment => extreme_data}/meteo_france_data/scm_models_data/visualization/utils.py (100%) rename {experiment => extreme_data}/meteo_france_data/stations_data/__init__.py (100%) rename {experiment => extreme_data}/meteo_france_data/stations_data/comparison_analysis.py (98%) rename {experiment => extreme_data}/meteo_france_data/stations_data/comparisons_visualization.py (97%) rename {extreme_trend_test => extreme_trend}/__init__.py (100%) rename {extreme_trend_test => extreme_trend}/abstract_gev_trend_test.py (98%) rename {extreme_trend_test => extreme_trend}/trend_test_one_parameter/__init__.py (100%) rename {extreme_trend_test => extreme_trend}/trend_test_one_parameter/abstract_comparison_non_stationary_model.py (85%) rename {extreme_trend_test => extreme_trend}/trend_test_one_parameter/gev_trend_test_one_parameter.py (97%) rename {extreme_trend_test => extreme_trend}/trend_test_one_parameter/gumbel_trend_test_one_parameter.py (96%) rename {extreme_trend_test => extreme_trend}/trend_test_three_parameters/__init__.py (100%) rename {extreme_trend_test => extreme_trend}/trend_test_three_parameters/gev_trend_test_three_parameters.py (92%) rename {extreme_trend_test => extreme_trend}/trend_test_two_parameters/__init__.py (100%) rename {extreme_trend_test => extreme_trend}/trend_test_two_parameters/gev_trend_test_two_parameters.py (93%) rename {extreme_trend_test => extreme_trend}/trend_test_two_parameters/gumbel_test_two_parameters.py (92%) rename {extreme_trend_test => extreme_trend}/visualizers/__init__.py (100%) rename {extreme_trend_test => extreme_trend}/visualizers/study_visualizer_for_non_stationary_trends.py (96%) rename {extreme_trend_test => extreme_trend}/visualizers/study_visualizer_for_shape_repartition.py (76%) rename {extreme_trend_test => extreme_trend}/visualizers/utils.py (93%) rename test/{test_experiment => test_extreme_data}/__init__.py (100%) create mode 100644 test/test_extreme_data/test_meteo_france_data/__init__.py rename test/{test_experiment => test_extreme_data/test_meteo_france_data}/test_SCM_oriented_data.py (71%) rename test/{test_experiment => test_extreme_data/test_meteo_france_data}/test_SCM_study.py (91%) create mode 100644 test/test_extreme_trend/__init__.py rename test/{test_experiment/test_trend_analysis.py => test_extreme_trend/test_extreme_trend.py} (100%) diff --git a/experiment/__init__.py b/extreme_data/__init__.py similarity index 100% rename from experiment/__init__.py rename to extreme_data/__init__.py diff --git a/experiment/eurocode_data/__init__.py b/extreme_data/eurocode_data/__init__.py similarity index 100% rename from experiment/eurocode_data/__init__.py rename to extreme_data/eurocode_data/__init__.py diff --git a/experiment/eurocode_data/departement_alpes_francaises.py b/extreme_data/eurocode_data/departement_alpes_francaises.py similarity index 93% rename from experiment/eurocode_data/departement_alpes_francaises.py rename to extreme_data/eurocode_data/departement_alpes_francaises.py index 9878c858..03c0ac02 100644 --- a/experiment/eurocode_data/departement_alpes_francaises.py +++ b/extreme_data/eurocode_data/departement_alpes_francaises.py @@ -1,5 +1,5 @@ import re -from experiment.eurocode_data.eurocode_region import AbstractEurocodeRegion, E, C2, C1 +from extreme_data.eurocode_data.eurocode_region import AbstractEurocodeRegion, E, C2, C1 from root_utils import get_display_name_from_object_type diff --git a/experiment/eurocode_data/eurocode_region.py b/extreme_data/eurocode_data/eurocode_region.py similarity index 97% rename from experiment/eurocode_data/eurocode_region.py rename to extreme_data/eurocode_data/eurocode_region.py index 5d94b524..4f803518 100644 --- a/experiment/eurocode_data/eurocode_region.py +++ b/extreme_data/eurocode_data/eurocode_region.py @@ -1,4 +1,4 @@ -from experiment.eurocode_data.utils import LAST_YEAR_FOR_EUROCODE +from extreme_data.eurocode_data.utils import LAST_YEAR_FOR_EUROCODE from root_utils import classproperty diff --git a/experiment/eurocode_data/massif_name_to_departement.py b/extreme_data/eurocode_data/massif_name_to_departement.py similarity index 93% rename from experiment/eurocode_data/massif_name_to_departement.py rename to extreme_data/eurocode_data/massif_name_to_departement.py index f92fb33b..415db0fe 100644 --- a/experiment/eurocode_data/massif_name_to_departement.py +++ b/extreme_data/eurocode_data/massif_name_to_departement.py @@ -1,8 +1,8 @@ from typing import Dict, List -from experiment.eurocode_data.departement_alpes_francaises import HauteSavoie, Savoie, Isere, Drome, HautesAlpes, \ +from extreme_data.eurocode_data.departement_alpes_francaises import HauteSavoie, Savoie, Isere, Drome, HautesAlpes, \ AlpesDeHauteProvence, AlpesMaritimes, AbstractDepartementAlpesFrancaises -from experiment.eurocode_data.eurocode_region import C1, C2, E +from extreme_data.eurocode_data.eurocode_region import C1, C2, E massif_name_to_departement_types = { 'Chablais': [HauteSavoie], diff --git a/experiment/eurocode_data/utils.py b/extreme_data/eurocode_data/utils.py similarity index 100% rename from experiment/eurocode_data/utils.py rename to extreme_data/eurocode_data/utils.py diff --git a/experiment/meteo_france_data/__init__.py b/extreme_data/meteo_france_data/__init__.py similarity index 100% rename from experiment/meteo_france_data/__init__.py rename to extreme_data/meteo_france_data/__init__.py diff --git a/experiment/meteo_france_data/adamont_data/__init__.py b/extreme_data/meteo_france_data/adamont_data/__init__.py similarity index 100% rename from experiment/meteo_france_data/adamont_data/__init__.py rename to extreme_data/meteo_france_data/adamont_data/__init__.py diff --git a/experiment/meteo_france_data/adamont_data/download_adamont.py b/extreme_data/meteo_france_data/adamont_data/download_adamont.py similarity index 100% rename from experiment/meteo_france_data/adamont_data/download_adamont.py rename to extreme_data/meteo_france_data/adamont_data/download_adamont.py diff --git a/experiment/meteo_france_data/adamont_data/ensemble_simulation.py b/extreme_data/meteo_france_data/adamont_data/ensemble_simulation.py similarity index 97% rename from experiment/meteo_france_data/adamont_data/ensemble_simulation.py rename to extreme_data/meteo_france_data/adamont_data/ensemble_simulation.py index d669c35a..1731a81d 100644 --- a/experiment/meteo_france_data/adamont_data/ensemble_simulation.py +++ b/extreme_data/meteo_france_data/adamont_data/ensemble_simulation.py @@ -5,7 +5,7 @@ import os.path as op import numpy as np from cached_property import cached_property -from experiment.meteo_france_data.adamont_data.single_simulation import SingleSimulation +from extreme_data.meteo_france_data.adamont_data.single_simulation import SingleSimulation ADAMONT_PATH = r"/home/erwan/Documents/projects/spatiotemporalextremes/local/spatio_temporal_datasets/ADAMONT" diff --git a/experiment/meteo_france_data/adamont_data/single_simulation.py b/extreme_data/meteo_france_data/adamont_data/single_simulation.py similarity index 96% rename from experiment/meteo_france_data/adamont_data/single_simulation.py rename to extreme_data/meteo_france_data/adamont_data/single_simulation.py index 0292ed6c..7ba82ed8 100644 --- a/experiment/meteo_france_data/adamont_data/single_simulation.py +++ b/extreme_data/meteo_france_data/adamont_data/single_simulation.py @@ -6,7 +6,7 @@ from cached_property import cached_property from netCDF4._netCDF4 import Dataset from datetime import timedelta -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy class SingleSimulation(object): diff --git a/experiment/meteo_france_data/scm_models_data/__init__.py b/extreme_data/meteo_france_data/scm_models_data/__init__.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/__init__.py rename to extreme_data/meteo_france_data/scm_models_data/__init__.py diff --git a/experiment/meteo_france_data/scm_models_data/abstract_extended_study.py b/extreme_data/meteo_france_data/scm_models_data/abstract_extended_study.py similarity index 97% rename from experiment/meteo_france_data/scm_models_data/abstract_extended_study.py rename to extreme_data/meteo_france_data/scm_models_data/abstract_extended_study.py index d9c8c9e5..fcbfb2bd 100644 --- a/experiment/meteo_france_data/scm_models_data/abstract_extended_study.py +++ b/extreme_data/meteo_france_data/scm_models_data/abstract_extended_study.py @@ -1,7 +1,7 @@ import numpy as np from collections import OrderedDict -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \ AbstractSpatialCoordinates from root_utils import classproperty diff --git a/experiment/meteo_france_data/scm_models_data/abstract_study.py b/extreme_data/meteo_france_data/scm_models_data/abstract_study.py similarity index 98% rename from experiment/meteo_france_data/scm_models_data/abstract_study.py rename to extreme_data/meteo_france_data/scm_models_data/abstract_study.py index b60f72a6..366ee0bb 100644 --- a/experiment/meteo_france_data/scm_models_data/abstract_study.py +++ b/extreme_data/meteo_france_data/scm_models_data/abstract_study.py @@ -18,14 +18,14 @@ from PIL import ImageDraw from matplotlib.colors import Normalize from netCDF4 import Dataset -from experiment.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable -from experiment.meteo_france_data.scm_models_data.scm_constants import ALTITUDES, ZS_INT_23, ZS_INT_MASK, LONGITUDES, \ +from extreme_data.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable +from extreme_data.meteo_france_data.scm_models_data.scm_constants import ALTITUDES, ZS_INT_23, ZS_INT_MASK, LONGITUDES, \ LATITUDES, ORIENTATIONS, SLOPES, ORDERED_ALLSLOPES_ALTITUDES, ORDERED_ALLSLOPES_ORIENTATIONS, \ ORDERED_ALLSLOPES_SLOPES, ORDERED_ALLSLOPES_MASSIFNUM -from experiment.meteo_france_data.scm_models_data.visualization.utils import get_km_formatter +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import get_km_formatter from extreme_fit.function.margin_function.abstract_margin_function import \ AbstractMarginFunction -from experiment.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import create_colorbase_axis, \ +from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import create_colorbase_axis, \ get_shifted_map, get_colors from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \ diff --git a/experiment/meteo_france_data/scm_models_data/abstract_variable.py b/extreme_data/meteo_france_data/scm_models_data/abstract_variable.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/abstract_variable.py rename to extreme_data/meteo_france_data/scm_models_data/abstract_variable.py diff --git a/experiment/meteo_france_data/scm_models_data/crocus/__init__.py b/extreme_data/meteo_france_data/scm_models_data/crocus/__init__.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/crocus/__init__.py rename to extreme_data/meteo_france_data/scm_models_data/crocus/__init__.py diff --git a/experiment/meteo_france_data/scm_models_data/crocus/crocus.py b/extreme_data/meteo_france_data/scm_models_data/crocus/crocus.py similarity index 93% rename from experiment/meteo_france_data/scm_models_data/crocus/crocus.py rename to extreme_data/meteo_france_data/scm_models_data/crocus/crocus.py index 0ed8aea7..554fda4e 100644 --- a/experiment/meteo_france_data/scm_models_data/crocus/crocus.py +++ b/extreme_data/meteo_france_data/scm_models_data/crocus/crocus.py @@ -2,9 +2,9 @@ from collections import OrderedDict import numpy as np -from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import CrocusTotalSweVariable, \ +from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import CrocusTotalSweVariable, \ CrocusDepthVariable, CrocusRecentSweVariableThreeDays, TotalSnowLoadVariable, RecentSnowLoadVariableThreeDays, \ CrocusSnowLoadEurocodeVariable, CrocusDensityVariable, RecentSnowLoadVariableFiveDays, \ RecentSnowLoadVariableSevenDays, RecentSnowLoadVariableOneDay diff --git a/experiment/meteo_france_data/scm_models_data/crocus/crocus_variables.py b/extreme_data/meteo_france_data/scm_models_data/crocus/crocus_variables.py similarity index 96% rename from experiment/meteo_france_data/scm_models_data/crocus/crocus_variables.py rename to extreme_data/meteo_france_data/scm_models_data/crocus/crocus_variables.py index aba169d2..8b0eac94 100644 --- a/experiment/meteo_france_data/scm_models_data/crocus/crocus_variables.py +++ b/extreme_data/meteo_france_data/scm_models_data/crocus/crocus_variables.py @@ -1,6 +1,6 @@ import numpy as np -from experiment.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable +from extreme_data.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable class CrocusVariable(AbstractVariable): diff --git a/experiment/meteo_france_data/scm_models_data/crocus/taline_data.py b/extreme_data/meteo_france_data/scm_models_data/crocus/taline_data.py similarity index 79% rename from experiment/meteo_france_data/scm_models_data/crocus/taline_data.py rename to extreme_data/meteo_france_data/scm_models_data/crocus/taline_data.py index 8de3a72f..2f992812 100644 --- a/experiment/meteo_france_data/scm_models_data/crocus/taline_data.py +++ b/extreme_data/meteo_france_data/scm_models_data/crocus/taline_data.py @@ -3,8 +3,8 @@ from collections import OrderedDict import numpy as np import pandas as pd -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusDepth -from experiment.meteo_france_data.scm_models_data.scm_constants import ALTITUDES +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusDepth +from extreme_data.meteo_france_data.scm_models_data.scm_constants import ALTITUDES from root_utils import get_display_name_from_object_type massif_name = 'Queyras' diff --git a/experiment/meteo_france_data/scm_models_data/safran/__init__.py b/extreme_data/meteo_france_data/scm_models_data/safran/__init__.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/safran/__init__.py rename to extreme_data/meteo_france_data/scm_models_data/safran/__init__.py diff --git a/experiment/meteo_france_data/scm_models_data/safran/cumulated_study.py b/extreme_data/meteo_france_data/scm_models_data/safran/cumulated_study.py similarity index 77% rename from experiment/meteo_france_data/scm_models_data/safran/cumulated_study.py rename to extreme_data/meteo_france_data/scm_models_data/safran/cumulated_study.py index dc0ee1d1..7f08607b 100644 --- a/experiment/meteo_france_data/scm_models_data/safran/cumulated_study.py +++ b/extreme_data/meteo_france_data/scm_models_data/safran/cumulated_study.py @@ -1,5 +1,5 @@ -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable NB_DAYS = [1, 3, 5, 7] diff --git a/experiment/meteo_france_data/scm_models_data/safran/safran.py b/extreme_data/meteo_france_data/scm_models_data/safran/safran.py similarity index 88% rename from experiment/meteo_france_data/scm_models_data/safran/safran.py rename to extreme_data/meteo_france_data/scm_models_data/safran/safran.py index f2fe8f75..1d1a9d46 100644 --- a/experiment/meteo_france_data/scm_models_data/safran/safran.py +++ b/extreme_data/meteo_france_data/scm_models_data/safran/safran.py @@ -1,10 +1,10 @@ import numpy as np -from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable -from experiment.meteo_france_data.scm_models_data.safran.cumulated_study import CumulatedStudy -from experiment.meteo_france_data.scm_models_data.safran.safran_variable import SafranSnowfallVariable, \ +from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable +from extreme_data.meteo_france_data.scm_models_data.safran.cumulated_study import CumulatedStudy +from extreme_data.meteo_france_data.scm_models_data.safran.safran_variable import SafranSnowfallVariable, \ SafranRainfallVariable, SafranTemperatureVariable, SafranTotalPrecipVariable diff --git a/experiment/meteo_france_data/scm_models_data/safran/safran_variable.py b/extreme_data/meteo_france_data/scm_models_data/safran/safran_variable.py similarity index 98% rename from experiment/meteo_france_data/scm_models_data/safran/safran_variable.py rename to extreme_data/meteo_france_data/scm_models_data/safran/safran_variable.py index 2bca65f1..65928b21 100644 --- a/experiment/meteo_france_data/scm_models_data/safran/safran_variable.py +++ b/extreme_data/meteo_france_data/scm_models_data/safran/safran_variable.py @@ -1,6 +1,6 @@ import numpy as np -from experiment.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable +from extreme_data.meteo_france_data.scm_models_data.abstract_variable import AbstractVariable class SafranSnowfallVariable(AbstractVariable): diff --git a/experiment/meteo_france_data/scm_models_data/scm_constants.py b/extreme_data/meteo_france_data/scm_models_data/scm_constants.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/scm_constants.py rename to extreme_data/meteo_france_data/scm_models_data/scm_constants.py diff --git a/experiment/meteo_france_data/scm_models_data/visualization/__init__.py b/extreme_data/meteo_france_data/scm_models_data/visualization/__init__.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/visualization/__init__.py rename to extreme_data/meteo_france_data/scm_models_data/visualization/__init__.py diff --git a/experiment/meteo_france_data/scm_models_data/visualization/create_shifted_cmap.py b/extreme_data/meteo_france_data/scm_models_data/visualization/create_shifted_cmap.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/visualization/create_shifted_cmap.py rename to extreme_data/meteo_france_data/scm_models_data/visualization/create_shifted_cmap.py diff --git a/experiment/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py b/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py similarity index 95% rename from experiment/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py rename to extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py index 0ad748c0..7470f697 100644 --- a/experiment/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py +++ b/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py @@ -2,15 +2,15 @@ import time from collections import OrderedDict from typing import List -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusDepth, CrocusSweTotal, ExtendedCrocusDepth, \ +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusDepth, CrocusSweTotal, ExtendedCrocusDepth, \ ExtendedCrocusSweTotal, CrocusDaysWithSnowOnGround, CrocusSwe3Days, CrocusSnowLoad3Days, CrocusSnowLoadTotal, \ CrocusSnowLoadEurocode, CrocusSnowLoad5Days, CrocusSnowLoad7Days -from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import CrocusDensityVariable -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, ExtendedSafranSnowfall, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import CrocusDensityVariable +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, ExtendedSafranSnowfall, \ SafranRainfall, \ SafranTemperature, SafranPrecipitation -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ CrocusDifferenceSnowLoad, \ diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualizer.py b/extreme_data/meteo_france_data/scm_models_data/visualization/study_visualizer.py similarity index 99% rename from experiment/meteo_france_data/scm_models_data/visualization/study_visualizer.py rename to extreme_data/meteo_france_data/scm_models_data/visualization/study_visualizer.py index 866156ac..a75e43b3 100644 --- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualizer.py +++ b/extreme_data/meteo_france_data/scm_models_data/visualization/study_visualizer.py @@ -14,9 +14,9 @@ import seaborn as sns from extreme_fit.model.result_from_model_fit.result_from_extremes.eurocode_return_level_uncertainties import \ EurocodeConfidenceIntervalFromExtremes, compute_eurocode_confidence_interval -from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes +from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes from extreme_fit.distribution.abstract_params import AbstractParams from extreme_fit.estimator.full_estimator.abstract_full_estimator import \ FullEstimatorInASingleStepWithSmoothMargin diff --git a/experiment/meteo_france_data/scm_models_data/visualization/utils.py b/extreme_data/meteo_france_data/scm_models_data/visualization/utils.py similarity index 100% rename from experiment/meteo_france_data/scm_models_data/visualization/utils.py rename to extreme_data/meteo_france_data/scm_models_data/visualization/utils.py diff --git a/experiment/meteo_france_data/stations_data/__init__.py b/extreme_data/meteo_france_data/stations_data/__init__.py similarity index 100% rename from experiment/meteo_france_data/stations_data/__init__.py rename to extreme_data/meteo_france_data/stations_data/__init__.py diff --git a/experiment/meteo_france_data/stations_data/comparison_analysis.py b/extreme_data/meteo_france_data/stations_data/comparison_analysis.py similarity index 98% rename from experiment/meteo_france_data/stations_data/comparison_analysis.py rename to extreme_data/meteo_france_data/stations_data/comparison_analysis.py index 0eb48e2a..426de151 100644 --- a/experiment/meteo_france_data/stations_data/comparison_analysis.py +++ b/extreme_data/meteo_france_data/stations_data/comparison_analysis.py @@ -4,8 +4,8 @@ from typing import List from cached_property import cached_property -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ ALL_ALTITUDES from extreme_fit.estimator.full_estimator.abstract_full_estimator import \ FullEstimatorInASingleStepWithSmoothMargin diff --git a/experiment/meteo_france_data/stations_data/comparisons_visualization.py b/extreme_data/meteo_france_data/stations_data/comparisons_visualization.py similarity index 97% rename from experiment/meteo_france_data/stations_data/comparisons_visualization.py rename to extreme_data/meteo_france_data/stations_data/comparisons_visualization.py index 6a50ad29..e1142d75 100644 --- a/experiment/meteo_france_data/stations_data/comparisons_visualization.py +++ b/extreme_data/meteo_france_data/stations_data/comparisons_visualization.py @@ -9,10 +9,10 @@ import matplotlib.pyplot as plt import numpy as np import pandas as pd -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ VisualizationParameters -from experiment.meteo_france_data.stations_data.comparison_analysis import ComparisonAnalysis, MASSIF_COLUMN_NAME, \ +from extreme_data.meteo_france_data.stations_data.comparison_analysis import ComparisonAnalysis, MASSIF_COLUMN_NAME, \ REANALYSE_STR, ALTITUDE_COLUMN_NAME, STATION_COLUMN_NAME from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates diff --git a/extreme_fit/function/margin_function/abstract_margin_function.py b/extreme_fit/function/margin_function/abstract_margin_function.py index 981a25aa..98f04528 100644 --- a/extreme_fit/function/margin_function/abstract_margin_function.py +++ b/extreme_fit/function/margin_function/abstract_margin_function.py @@ -4,9 +4,9 @@ import matplotlib.pyplot as plt import numpy as np import pandas as pd -from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes from extreme_fit.distribution.gev.gev_params import GevParams -from experiment.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import imshow_shifted +from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import imshow_shifted from extreme_fit.function.abstract_function import AbstractFunction from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates from spatio_temporal_dataset.slicer.split import Split diff --git a/extreme_fit/model/result_from_model_fit/result_from_extremes/abstract_extract_eurocode_return_level.py b/extreme_fit/model/result_from_model_fit/result_from_extremes/abstract_extract_eurocode_return_level.py index fa620813..65dca7ad 100644 --- a/extreme_fit/model/result_from_model_fit/result_from_extremes/abstract_extract_eurocode_return_level.py +++ b/extreme_fit/model/result_from_model_fit/result_from_extremes/abstract_extract_eurocode_return_level.py @@ -3,7 +3,7 @@ from typing import List import numpy as np from cached_property import cached_property -from experiment.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator from extreme_fit.estimator.utils import load_margin_function diff --git a/extreme_fit/model/result_from_model_fit/result_from_extremes/eurocode_return_level_uncertainties.py b/extreme_fit/model/result_from_model_fit/result_from_extremes/eurocode_return_level_uncertainties.py index 8b5b7459..4f11e495 100644 --- a/extreme_fit/model/result_from_model_fit/result_from_extremes/eurocode_return_level_uncertainties.py +++ b/extreme_fit/model/result_from_model_fit/result_from_extremes/eurocode_return_level_uncertainties.py @@ -1,4 +1,4 @@ -from experiment.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE from extreme_fit.estimator.margin_estimator.utils import fitted_linear_margin_estimator from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \ ExtractEurocodeReturnLevelFromMyBayesianExtremes, ExtractEurocodeReturnLevelFromCiMethod diff --git a/extreme_trend_test/__init__.py b/extreme_trend/__init__.py similarity index 100% rename from extreme_trend_test/__init__.py rename to extreme_trend/__init__.py diff --git a/extreme_trend_test/abstract_gev_trend_test.py b/extreme_trend/abstract_gev_trend_test.py similarity index 98% rename from extreme_trend_test/abstract_gev_trend_test.py rename to extreme_trend/abstract_gev_trend_test.py index d1a6fe6d..48173331 100644 --- a/extreme_trend_test/abstract_gev_trend_test.py +++ b/extreme_trend/abstract_gev_trend_test.py @@ -5,8 +5,8 @@ import numpy as np from cached_property import cached_property from scipy.stats import chi2 -from experiment.eurocode_data.utils import EUROCODE_QUANTILE, YEAR_OF_INTEREST_FOR_RETURN_LEVEL -from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE, YEAR_OF_INTEREST_FOR_RETURN_LEVEL +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable from extreme_fit.estimator.margin_estimator.utils import fitted_linear_margin_estimator from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ diff --git a/extreme_trend_test/trend_test_one_parameter/__init__.py b/extreme_trend/trend_test_one_parameter/__init__.py similarity index 100% rename from extreme_trend_test/trend_test_one_parameter/__init__.py rename to extreme_trend/trend_test_one_parameter/__init__.py diff --git a/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py b/extreme_trend/trend_test_one_parameter/abstract_comparison_non_stationary_model.py similarity index 85% rename from extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py rename to extreme_trend/trend_test_one_parameter/abstract_comparison_non_stationary_model.py index 55ab4704..97e5e53a 100644 --- a/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py +++ b/extreme_trend/trend_test_one_parameter/abstract_comparison_non_stationary_model.py @@ -1,7 +1,7 @@ -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \ +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.trend_test_one_parameter.gev_trend_test_one_parameter import \ GevTrendTestOneParameter -from extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest +from extreme_trend.trend_test_two_parameters.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \ diff --git a/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py b/extreme_trend/trend_test_one_parameter/gev_trend_test_one_parameter.py similarity index 97% rename from extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py rename to extreme_trend/trend_test_one_parameter/gev_trend_test_one_parameter.py index 6f7b7978..fa1a4c3c 100644 --- a/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py +++ b/extreme_trend/trend_test_one_parameter/gev_trend_test_one_parameter.py @@ -1,5 +1,5 @@ -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.abstract_gev_trend_test import AbstractGevTrendTest from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \ diff --git a/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py b/extreme_trend/trend_test_one_parameter/gumbel_trend_test_one_parameter.py similarity index 96% rename from extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py rename to extreme_trend/trend_test_one_parameter/gumbel_trend_test_one_parameter.py index ac7359d1..0c7c0008 100644 --- a/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py +++ b/extreme_trend/trend_test_one_parameter/gumbel_trend_test_one_parameter.py @@ -1,6 +1,6 @@ # Comparison with the Gumbel model -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \ +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.trend_test_one_parameter.gev_trend_test_one_parameter import \ GevTrendTestOneParameter, GevTrendTestOneParameterAgainstStationary from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ diff --git a/extreme_trend_test/trend_test_three_parameters/__init__.py b/extreme_trend/trend_test_three_parameters/__init__.py similarity index 100% rename from extreme_trend_test/trend_test_three_parameters/__init__.py rename to extreme_trend/trend_test_three_parameters/__init__.py diff --git a/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py b/extreme_trend/trend_test_three_parameters/gev_trend_test_three_parameters.py similarity index 92% rename from extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py rename to extreme_trend/trend_test_three_parameters/gev_trend_test_three_parameters.py index 7a7b643d..baa69e62 100644 --- a/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py +++ b/extreme_trend/trend_test_three_parameters/gev_trend_test_three_parameters.py @@ -1,7 +1,7 @@ from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.abstract_gev_trend_test import AbstractGevTrendTest from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \ NonStationaryLocationAndScaleTemporalModel, GumbelTemporalModel from extreme_fit.distribution.gev.gev_params import GevParams diff --git a/extreme_trend_test/trend_test_two_parameters/__init__.py b/extreme_trend/trend_test_two_parameters/__init__.py similarity index 100% rename from extreme_trend_test/trend_test_two_parameters/__init__.py rename to extreme_trend/trend_test_two_parameters/__init__.py diff --git a/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py b/extreme_trend/trend_test_two_parameters/gev_trend_test_two_parameters.py similarity index 93% rename from extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py rename to extreme_trend/trend_test_two_parameters/gev_trend_test_two_parameters.py index 91cef298..eb4acd0c 100644 --- a/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py +++ b/extreme_trend/trend_test_two_parameters/gev_trend_test_two_parameters.py @@ -1,6 +1,6 @@ -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest -from extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \ +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.abstract_gev_trend_test import AbstractGevTrendTest +from extreme_trend.trend_test_one_parameter.gev_trend_test_one_parameter import \ GevLocationTrendTest, GevScaleTrendTest from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod diff --git a/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py b/extreme_trend/trend_test_two_parameters/gumbel_test_two_parameters.py similarity index 92% rename from extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py rename to extreme_trend/trend_test_two_parameters/gumbel_test_two_parameters.py index b91f99ab..8d9f2d57 100644 --- a/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py +++ b/extreme_trend/trend_test_two_parameters/gumbel_test_two_parameters.py @@ -1,5 +1,5 @@ -from experiment.eurocode_data.utils import EUROCODE_QUANTILE -from extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import \ +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE +from extreme_trend.trend_test_two_parameters.gev_trend_test_two_parameters import \ GevTrendTestTwoParameters from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ diff --git a/extreme_trend_test/visualizers/__init__.py b/extreme_trend/visualizers/__init__.py similarity index 100% rename from extreme_trend_test/visualizers/__init__.py rename to extreme_trend/visualizers/__init__.py diff --git a/extreme_trend_test/visualizers/study_visualizer_for_non_stationary_trends.py b/extreme_trend/visualizers/study_visualizer_for_non_stationary_trends.py similarity index 96% rename from extreme_trend_test/visualizers/study_visualizer_for_non_stationary_trends.py rename to extreme_trend/visualizers/study_visualizer_for_non_stationary_trends.py index bbcc4d5d..bb429ee4 100644 --- a/extreme_trend_test/visualizers/study_visualizer_for_non_stationary_trends.py +++ b/extreme_trend/visualizers/study_visualizer_for_non_stationary_trends.py @@ -7,20 +7,20 @@ import matplotlib.pyplot as plt import numpy as np from cached_property import cached_property -from experiment.eurocode_data.eurocode_region import C2, C1, E -from experiment.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region -from experiment.eurocode_data.utils import EUROCODE_QUANTILE, EUROCODE_RETURN_LEVEL_STR, \ +from extreme_data.eurocode_data.eurocode_region import C2, C1, E +from extreme_data.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region +from extreme_data.eurocode_data.utils import EUROCODE_QUANTILE, EUROCODE_RETURN_LEVEL_STR, \ YEAR_OF_INTEREST_FOR_RETURN_LEVEL -from experiment.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map, get_colors -from experiment.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map, get_colors +from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer from projects.exceeding_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER -from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest -from extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \ +from extreme_trend.abstract_gev_trend_test import AbstractGevTrendTest +from extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter import \ GumbelLocationTrendTest, GevStationaryVersusGumbel, GumbelScaleTrendTest, GumbelVersusGumbel -from extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \ +from extreme_trend.trend_test_two_parameters.gumbel_test_two_parameters import \ GumbelLocationAndScaleTrendTest from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod diff --git a/extreme_trend_test/visualizers/study_visualizer_for_shape_repartition.py b/extreme_trend/visualizers/study_visualizer_for_shape_repartition.py similarity index 76% rename from extreme_trend_test/visualizers/study_visualizer_for_shape_repartition.py rename to extreme_trend/visualizers/study_visualizer_for_shape_repartition.py index db6e3f3a..392cedd2 100644 --- a/extreme_trend_test/visualizers/study_visualizer_for_shape_repartition.py +++ b/extreme_trend/visualizers/study_visualizer_for_shape_repartition.py @@ -1,9 +1,9 @@ import matplotlib from cached_property import cached_property -from experiment.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends diff --git a/extreme_trend_test/visualizers/utils.py b/extreme_trend/visualizers/utils.py similarity index 93% rename from extreme_trend_test/visualizers/utils.py rename to extreme_trend/visualizers/utils.py index 575c1424..f674e897 100644 --- a/extreme_trend_test/visualizers/utils.py +++ b/extreme_trend/visualizers/utils.py @@ -2,7 +2,7 @@ from collections import OrderedDict from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends def load_altitude_to_visualizer(altitudes, massif_names, model_subsets_for_uncertainty, study_class, diff --git a/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py b/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py index b6fc9e48..0de59453 100644 --- a/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py +++ b/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py @@ -2,9 +2,9 @@ import pandas as pd import seaborn as sns import matplotlib.pyplot as plt -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes -from experiment.exceeding_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes +from extreme_data.exceeding_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \ compute_gelman_score from extreme_fit.estimator.margin_estimator.utils import fitted_linear_margin_estimator from extreme_fit.distribution.gev.gev_params import GevParams diff --git a/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py b/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py index bb4a8cf8..8cbd76dd 100644 --- a/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py +++ b/projects/contrasting_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py @@ -1,7 +1,7 @@ import pandas as pd -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_data.exceeding_snow_loads.paper_main_utils import load_altitude_to_visualizer +from extreme_data.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/projects/contrasting_snow_loads/main_result.py b/projects/contrasting_snow_loads/main_result.py index 1a810958..79b07f79 100644 --- a/projects/contrasting_snow_loads/main_result.py +++ b/projects/contrasting_snow_loads/main_result.py @@ -2,19 +2,19 @@ from multiprocessing.pool import Pool import matplotlib as mpl -from extreme_trend_test.visualizers.utils import load_altitude_to_visualizer +from extreme_trend.visualizers.utils import load_altitude_to_visualizer mpl.use('Agg') mpl.rcParams['text.usetex'] = True mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranPrecipitation3Days, \ +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranPrecipitation3Days, \ SafranPrecipitation1Day, SafranPrecipitation5Days, SafranPrecipitation7Days, SafranSnowfall1Day, \ SafranSnowfall5Days, SafranSnowfall3Days, SafranSnowfall7Days, SafranRainfall1Day, SafranRainfall3Days, \ SafranRainfall5Days, SafranRainfall7Days -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ CrocusSnowLoad5Days, CrocusSnowLoad7Days, CrocusSnowLoad1Day from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \ ConfidenceIntervalMethodFromExtremes diff --git a/projects/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py b/projects/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py index 881ac233..5b5a6ea3 100644 --- a/projects/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py +++ b/projects/contrasting_snow_loads/main_spatial_relative_change_in_maxima_at_fixed_altitude.py @@ -1,7 +1,7 @@ -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ CrocusSnowLoadTotal -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, SafranRainfall, SafranPrecipitation -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, SafranRainfall, SafranPrecipitation +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer import matplotlib.pyplot as plt diff --git a/projects/contrasting_snow_loads/plot_contrasting_trend_curves.py b/projects/contrasting_snow_loads/plot_contrasting_trend_curves.py index 5e06210f..47c732bd 100644 --- a/projects/contrasting_snow_loads/plot_contrasting_trend_curves.py +++ b/projects/contrasting_snow_loads/plot_contrasting_trend_curves.py @@ -1,10 +1,10 @@ from typing import Dict 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 extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes from projects.exceeding_snow_loads.utils import dpi_paper1_figure -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py b/projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py index 485e72aa..1eeb3851 100644 --- a/projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py +++ b/projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py @@ -1,7 +1,7 @@ import pandas as pd -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends def mix_dsitrbution_impact(): diff --git a/projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py b/projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py index 0c9c44e9..d39214fb 100644 --- a/projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py +++ b/projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py @@ -1,9 +1,9 @@ import matplotlib.pyplot as plt -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ ALL_ALTITUDES_WITHOUT_NAN -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py b/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py index 6c215564..f392813a 100644 --- a/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py +++ b/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py @@ -6,13 +6,13 @@ import numpy as np import pandas as pd from matplotlib.ticker import PercentFormatter -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \ AbstractExtractEurocodeReturnLevel from projects.exceeding_snow_loads.data.main_example_swe_total_plot import tuples_for_examples_paper1 -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends from extreme_fit.distribution.gev.gev_params import GevParams diff --git a/projects/exceeding_snow_loads/checks/uncertainty_interval_size.py b/projects/exceeding_snow_loads/checks/uncertainty_interval_size.py index 2be62ddc..05cd8c07 100644 --- a/projects/exceeding_snow_loads/checks/uncertainty_interval_size.py +++ b/projects/exceeding_snow_loads/checks/uncertainty_interval_size.py @@ -2,8 +2,8 @@ from typing import Dict import pandas as pd -from experiment.eurocode_data.utils import EUROCODE_ALTITUDES -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_data.eurocode_data.utils import EUROCODE_ALTITUDES +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty diff --git a/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py b/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py index c8e13780..7de55d1b 100644 --- a/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py +++ b/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py @@ -1,7 +1,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.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ ALL_ALTITUDES_WITHOUT_NAN from projects.exceeding_snow_loads.check_mle_convergence_for_trends.without_maximum.study_visualizer_for_fit_witout_maximum import \ StudyVisualizerForFitWithoutMaximum diff --git a/projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py b/projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py index 633ceaeb..31d9d5eb 100644 --- a/projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py +++ b/projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py @@ -3,8 +3,8 @@ from typing import Dict, Tuple import numpy as np from cached_property import cached_property -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/presentation/accumulation_in_winter.py b/projects/exceeding_snow_loads/presentation/accumulation_in_winter.py index 52d93222..4a06f9f2 100644 --- a/projects/exceeding_snow_loads/presentation/accumulation_in_winter.py +++ b/projects/exceeding_snow_loads/presentation/accumulation_in_winter.py @@ -1,6 +1,6 @@ import matplotlib.pyplot as plt -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable study = CrocusSnowLoadTotal(altitude=1800) year = 1978 diff --git a/projects/exceeding_snow_loads/presentation/statistical_model.py b/projects/exceeding_snow_loads/presentation/statistical_model.py index 9e15740f..969eb23e 100644 --- a/projects/exceeding_snow_loads/presentation/statistical_model.py +++ b/projects/exceeding_snow_loads/presentation/statistical_model.py @@ -28,8 +28,8 @@ def binomial_observation(): def histogram_for_gev(): import matplotlib.pyplot as plt - from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal - from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable + from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal + from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import AbstractSnowLoadVariable ax = plt.gca() study = CrocusSnowLoadTotal(altitude=1800) s = study.observations_annual_maxima.df_maxima_gev.loc['Vercors'] diff --git a/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py b/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py index 296fc8f6..0cdde265 100644 --- a/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py +++ b/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py @@ -2,10 +2,10 @@ import matplotlib.pyplot as plt from copy import deepcopy, copy import numpy as np -from experiment.eurocode_data.eurocode_region import C2, E, C1, C -from experiment.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region -from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.eurocode_data.eurocode_region import C2, E, C1, C +from extreme_data.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region +from extreme_data.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from root_utils import get_display_name_from_object_type diff --git a/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py b/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py index ed5fc29b..5719e15f 100644 --- a/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py +++ b/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py @@ -1,9 +1,9 @@ import matplotlib.pyplot as plt -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer from projects.exceeding_snow_loads.utils import dpi_paper1_figure diff --git a/projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py b/projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py index ea28deb3..f99ed9f2 100644 --- a/projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py +++ b/projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py @@ -3,9 +3,9 @@ from collections import OrderedDict import numpy as np from cached_property import cached_property -from experiment.meteo_france_data.scm_models_data.crocus.crocus import Crocus, CrocusSweTotal, CrocusSnowLoadTotal, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import Crocus, CrocusSweTotal, CrocusSnowLoadTotal, \ CrocusSnowLoadEurocode, CrocusDepth -from experiment.meteo_france_data.scm_models_data.crocus.crocus_variables import TotalSnowLoadVariable, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus_variables import TotalSnowLoadVariable, \ CrocusDensityVariable, CrocusDepthVariable diff --git a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py b/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py index 0adf4b01..c8ec04ef 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py +++ b/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py @@ -1,9 +1,9 @@ # mpl.rcParams['text.usetex'] = True # mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION, snow_density_str -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer import matplotlib.pyplot as plt diff --git a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py b/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py index 454cadcb..d71b0e53 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py +++ b/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py @@ -1,6 +1,6 @@ -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer import matplotlib.pyplot as plt diff --git a/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py b/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py index 4e6ce1fc..975a9e68 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py +++ b/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py @@ -1,6 +1,6 @@ -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer import matplotlib.pyplot as plt diff --git a/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py b/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py index edffbfd8..6a99cc1a 100644 --- a/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py +++ b/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py @@ -2,11 +2,11 @@ from multiprocessing.pool import Pool import matplotlib as mpl -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from extreme_trend_test.visualizers.utils import load_altitude_to_visualizer +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_trend.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 \ +from extreme_trend.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 diff --git a/projects/exceeding_snow_loads/section_results/main_shape_repartition.py b/projects/exceeding_snow_loads/section_results/main_shape_repartition.py index 0582eb32..9416c10c 100644 --- a/projects/exceeding_snow_loads/section_results/main_shape_repartition.py +++ b/projects/exceeding_snow_loads/section_results/main_shape_repartition.py @@ -1,7 +1,7 @@ -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal -from extreme_trend_test.visualizers.study_visualizer_for_shape_repartition import \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal +from extreme_trend.visualizers.study_visualizer_for_shape_repartition import \ StudyVisualizerForShape -from extreme_trend_test.visualizers.utils import load_altitude_to_visualizer +from extreme_trend.visualizers.utils import load_altitude_to_visualizer def main_shape_repartition(altitudes, massif_names=None, diff --git a/projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py b/projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py index daf93d71..ea587bd2 100644 --- a/projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py +++ b/projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py @@ -2,7 +2,7 @@ import matplotlib.pyplot as plt 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 +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import ModelSubsetForUncertainty def plot_diagnosis_risk(altitude_to_visualizer): diff --git a/projects/exceeding_snow_loads/section_results/plot_selection_curves.py b/projects/exceeding_snow_loads/section_results/plot_selection_curves.py index 6f1f45cc..2b4ced66 100644 --- a/projects/exceeding_snow_loads/section_results/plot_selection_curves.py +++ b/projects/exceeding_snow_loads/section_results/plot_selection_curves.py @@ -1,9 +1,9 @@ from typing import Dict import matplotlib.pyplot as plt -from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes 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_trend.visualizers.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends def permute(l, permutation): @@ -32,7 +32,7 @@ def plot_selection_curves(altitude_to_visualizer: Dict[int, StudyVisualizerForNo print(l) print(select_list) print(selected_and_signifcative_list) - # [(5, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters.GevLocationAgainstGumbel'> ), (6, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters.GevScaleAgainstGumbel' > ), (2, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelScaleTrendTest' > ), (1, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelLocationTrendTest' > ), (7, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_three_parameters.gev_trend_test_three_parameters.GevLocationAndScaleTrendTestAgainstGumbel' > ), (3, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters.GumbelLocationAndScaleTrendTest' > ), (4, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter.GevStationaryVersusGumbel' > ), (0, < class 'data.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelVersusGumbel' > )] + # [(5, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_two_parameters.gev_trend_test_two_parameters.GevLocationAgainstGumbel'> ), (6, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_two_parameters.gev_trend_test_two_parameters.GevScaleAgainstGumbel' > ), (2, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelScaleTrendTest' > ), (1, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelLocationTrendTest' > ), (7, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_three_parameters.gev_trend_test_three_parameters.GevLocationAndScaleTrendTestAgainstGumbel' > ), (3, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_two_parameters.gumbel_test_two_parameters.GumbelLocationAndScaleTrendTest' > ), (4, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter.GevStationaryVersusGumbel' > ), (0, < class 'data.trend_analysis.univariate_test.extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter.GumbelVersusGumbel' > )] # [32.64462809917355, 24.380165289256198, 12.396694214876034, 9.50413223140496, 9.090909090909092, 5.785123966942149, 3.71900826446281, 2.479338842975207] # [0, 13.223140495867769, 7.851239669421488, 8.264462809917354, 4.958677685950414, 2.479338842975207, 0.8264462809917356, 2.0661157024793386] diff --git a/projects/exceeding_snow_loads/section_results/plot_trend_curves.py b/projects/exceeding_snow_loads/section_results/plot_trend_curves.py index 0410a4fe..a2516bda 100644 --- a/projects/exceeding_snow_loads/section_results/plot_trend_curves.py +++ b/projects/exceeding_snow_loads/section_results/plot_trend_curves.py @@ -1,10 +1,10 @@ from typing import Dict 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 extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes from projects.exceeding_snow_loads.utils import dpi_paper1_figure -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py b/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py index 76666e3d..78cdc298 100644 --- a/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py +++ b/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py @@ -3,16 +3,16 @@ import matplotlib.pyplot as plt import numpy as np -from experiment.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_ALTITUDES, \ +from extreme_data.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 extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy, filled_marker_legend_list2 from projects.exceeding_snow_loads.utils import dpi_paper1_figure -from extreme_trend_test.visualizers.study_visualizer_for_non_stationary_trends import \ +from extreme_trend.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 -from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes +from extreme_data.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region +from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import ci_method_to_color from root_utils import get_display_name_from_object_type diff --git a/projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py b/projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py index 26e73132..3b53c98b 100644 --- a/projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py +++ b/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_ALTITUDES +from extreme_data.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 \ +from extreme_trend.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 diff --git a/projects/exceeding_snow_loads/utils.py b/projects/exceeding_snow_loads/utils.py index 1a560af5..74fdd345 100644 --- a/projects/exceeding_snow_loads/utils.py +++ b/projects/exceeding_snow_loads/utils.py @@ -1,16 +1,16 @@ from enum import Enum -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoadEurocode, \ +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoadEurocode, \ CrocusSnowLoad3Days -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ ALL_ALTITUDES_WITHOUT_NAN -from extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \ +from extreme_trend.trend_test_one_parameter.gumbel_trend_test_one_parameter import \ GumbelVersusGumbel, GumbelLocationTrendTest, GumbelScaleTrendTest, GevStationaryVersusGumbel -from extreme_trend_test.trend_test_three_parameters.gev_trend_test_three_parameters import \ +from extreme_trend.trend_test_three_parameters.gev_trend_test_three_parameters import \ GevLocationAndScaleTrendTestAgainstGumbel -from extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import \ +from extreme_trend.trend_test_two_parameters.gev_trend_test_two_parameters import \ GevLocationAgainstGumbel, GevScaleAgainstGumbel -from extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \ +from extreme_trend.trend_test_two_parameters.gumbel_test_two_parameters import \ GumbelLocationAndScaleTrendTest paper_altitudes = ALL_ALTITUDES_WITHOUT_NAN diff --git a/projects/projection_snow_load/main_difference_between_reanalysis_and_simulations.py b/projects/projection_snow_load/main_difference_between_reanalysis_and_simulations.py index 6acff7ce..c152e7d1 100644 --- a/projects/projection_snow_load/main_difference_between_reanalysis_and_simulations.py +++ b/projects/projection_snow_load/main_difference_between_reanalysis_and_simulations.py @@ -1,7 +1,7 @@ -from experiment.meteo_france_data.adamont_data.ensemble_simulation import EnsembleSimulation -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ +from extreme_data.meteo_france_data.adamont_data.ensemble_simulation import EnsembleSimulation +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad3Days, \ CrocusSweTotal -from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer import matplotlib.pyplot as plt diff --git a/test/test_experiment/__init__.py b/test/test_extreme_data/__init__.py similarity index 100% rename from test/test_experiment/__init__.py rename to test/test_extreme_data/__init__.py diff --git a/test/test_extreme_data/test_meteo_france_data/__init__.py b/test/test_extreme_data/test_meteo_france_data/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/test_experiment/test_SCM_oriented_data.py b/test/test_extreme_data/test_meteo_france_data/test_SCM_oriented_data.py similarity index 71% rename from test/test_experiment/test_SCM_oriented_data.py rename to test/test_extreme_data/test_meteo_france_data/test_SCM_oriented_data.py index 7b35d188..4152e867 100644 --- a/test/test_experiment/test_SCM_oriented_data.py +++ b/test/test_extreme_data/test_meteo_france_data/test_SCM_oriented_data.py @@ -4,9 +4,9 @@ import unittest import pandas as pd -from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall -from experiment.meteo_france_data.scm_models_data.scm_constants import SLOPES +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall +from extreme_data.meteo_france_data.scm_models_data.scm_constants import SLOPES class TestSCMOrientedData(unittest.TestCase): diff --git a/test/test_experiment/test_SCM_study.py b/test/test_extreme_data/test_meteo_france_data/test_SCM_study.py similarity index 91% rename from test/test_experiment/test_SCM_study.py rename to test/test_extreme_data/test_meteo_france_data/test_SCM_study.py index d0bc0498..a04a1405 100644 --- a/test/test_experiment/test_SCM_study.py +++ b/test/test_extreme_data/test_meteo_france_data/test_SCM_study.py @@ -4,10 +4,10 @@ from random import sample import pandas as pd -from experiment.meteo_france_data.scm_models_data.safran.cumulated_study import NB_DAYS -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, SafranTemperature, \ +from extreme_data.meteo_france_data.scm_models_data.safran.cumulated_study import NB_DAYS +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, SafranTemperature, \ SafranPrecipitation -from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ +from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ study_iterator_global, SCM_STUDIES, ALL_ALTITUDES from root_utils import get_display_name_from_object_type diff --git a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_bayesian.py b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_bayesian.py index 3799bf60..fd3c4e6e 100644 --- a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_bayesian.py +++ b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_bayesian.py @@ -3,7 +3,7 @@ import unittest import numpy as np import pandas as pd -from extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator +from extreme_trend.abstract_gev_trend_test import fitted_linear_margin_estimator from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \ diff --git a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_gumbel.py b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_gumbel.py index 43f90fd2..63113950 100644 --- a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_gumbel.py +++ b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_gumbel.py @@ -3,7 +3,7 @@ import unittest import numpy as np import pandas as pd -from extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator +from extreme_trend.abstract_gev_trend_test import fitted_linear_margin_estimator from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import GumbelTemporalModel diff --git a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_mle.py b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_mle.py index f8708022..a91b6ffb 100644 --- a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_mle.py +++ b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_extremes_mle.py @@ -3,7 +3,7 @@ import unittest import numpy as np import pandas as pd -from extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator +from extreme_trend.abstract_gev_trend_test import fitted_linear_margin_estimator from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \ TemporalMarginFitMethod from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \ diff --git a/test/test_extreme_trend/__init__.py b/test/test_extreme_trend/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/test_experiment/test_trend_analysis.py b/test/test_extreme_trend/test_extreme_trend.py similarity index 100% rename from test/test_experiment/test_trend_analysis.py rename to test/test_extreme_trend/test_extreme_trend.py diff --git a/test/test_utils.py b/test/test_utils.py index bc2bf761..cb7e9e41 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,8 +1,8 @@ from itertools import product from typing import List -from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from experiment.meteo_france_data.scm_models_data.crocus.crocus import Crocus, CrocusSweTotal, CrocusDepth +from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy +from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import Crocus, CrocusSweTotal, CrocusDepth from extreme_fit.estimator.full_estimator.abstract_full_estimator import SmoothMarginalsThenUnitaryMsp, \ FullEstimatorInASingleStepWithSmoothMargin from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator @@ -15,7 +15,7 @@ from extreme_fit.model.max_stable_model.abstract_max_stable_model import \ AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction from extreme_fit.model.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \ Geometric, ExtremalT, ISchlather -from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, Safran, SafranRainfall, \ +from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, Safran, SafranRainfall, \ SafranTemperature, SafranPrecipitation from extreme_fit.model.quantile_model.quantile_regression_model import ConstantQuantileRegressionModel, \ AllCoordinatesQuantileRegressionModel -- GitLab