diff --git a/projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py b/projects/altitude_spatial_model/__init__.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/__init__.py rename to projects/altitude_spatial_model/__init__.py diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/__init__.py b/projects/altitude_spatial_model/altitudes_fit/__init__.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/__init__.py rename to projects/altitude_spatial_model/altitudes_fit/__init__.py diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/altitudes_studies.py b/projects/altitude_spatial_model/altitudes_fit/altitudes_studies.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/altitudes_studies.py rename to projects/altitude_spatial_model/altitudes_fit/altitudes_studies.py diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/main_altitudes_studies.py b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py similarity index 92% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/main_altitudes_studies.py rename to projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py index 08566ff0c7978a1d9da5d6d38452dee3d0ba0940..5af3d2ac624097f6fd4effac97752095c2af31e5 100644 --- a/projects/contrasting_trends_in_snow_loads/altitudes_fit/main_altitudes_studies.py +++ b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py @@ -1,7 +1,7 @@ from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranSnowfall3Days, \ SafranSnowfall5Days, SafranSnowfall7Days, SafranPrecipitation1Day, SafranPrecipitation3Days, \ SafranPrecipitation5Days, SafranPrecipitation7Days -from projects.contrasting_trends_in_snow_loads.altitudes_fit.altitudes_studies import AltitudesStudies +from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies def main_plots_moments(): diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_datasets_generator.py b/projects/altitude_spatial_model/altitudes_fit/two_fold_datasets_generator.py similarity index 94% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_datasets_generator.py rename to projects/altitude_spatial_model/altitudes_fit/two_fold_datasets_generator.py index d8b698424377fae66e3fc5109d99757759668940..a931991ea0fae88313639df761df075de9e8d3ca 100644 --- a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_datasets_generator.py +++ b/projects/altitude_spatial_model/altitudes_fit/two_fold_datasets_generator.py @@ -2,7 +2,7 @@ from typing import Tuple, Dict, List from cached_property import cached_property -from projects.contrasting_trends_in_snow_loads.altitudes_fit.altitudes_studies import AltitudesStudies +from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset from spatio_temporal_dataset.slicer.split import invert_s_split diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_detail_fit.py b/projects/altitude_spatial_model/altitudes_fit/two_fold_detail_fit.py similarity index 95% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_detail_fit.py rename to projects/altitude_spatial_model/altitudes_fit/two_fold_detail_fit.py index 57332d46c64fe195e73807c70677f49428fcbf53..cc45a94f645ef1f29d9be3bb747a8f61f4f9c2ee 100644 --- a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_detail_fit.py +++ b/projects/altitude_spatial_model/altitudes_fit/two_fold_detail_fit.py @@ -1,10 +1,10 @@ -from typing import List, Tuple +from typing import List import numpy as np from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator from extreme_fit.estimator.margin_estimator.utils import fitted_linear_margin_estimator_short -from projects.contrasting_trends_in_snow_loads.altitudes_fit.utils import get_key_with_min_value, Score, Grouping +from projects.altitude_spatial_model.altitudes_fit.utils import get_key_with_min_value, Score, Grouping from spatio_temporal_dataset.slicer.split import Split diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_fit.py b/projects/altitude_spatial_model/altitudes_fit/two_fold_fit.py similarity index 83% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_fit.py rename to projects/altitude_spatial_model/altitudes_fit/two_fold_fit.py index b75980aab45b52d04e80e1413f07bf68330d3fe8..5f5371e3307f206f263910a52e31131d0955ff97 100644 --- a/projects/contrasting_trends_in_snow_loads/altitudes_fit/two_fold_fit.py +++ b/projects/altitude_spatial_model/altitudes_fit/two_fold_fit.py @@ -4,9 +4,9 @@ from cached_property import cached_property from extreme_fit.model.margin_model.utils import \ MarginFitMethod -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_detail_fit import TwoFoldMassifFit -from projects.contrasting_trends_in_snow_loads.altitudes_fit.utils import Score, Grouping +from projects.altitude_spatial_model.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator +from projects.altitude_spatial_model.altitudes_fit.two_fold_detail_fit import TwoFoldMassifFit +from projects.altitude_spatial_model.altitudes_fit.utils import Score, Grouping class TwoFoldFit(object): diff --git a/projects/contrasting_trends_in_snow_loads/altitudes_fit/utils.py b/projects/altitude_spatial_model/altitudes_fit/utils.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/altitudes_fit/utils.py rename to projects/altitude_spatial_model/altitudes_fit/utils.py diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/__init__.py b/projects/ogorman/__init__.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/__init__.py rename to projects/ogorman/__init__.py diff --git a/projects/contrasting_trends_in_snow_loads/snowfall fraction of total precipitation/__init__.py b/projects/ogorman/gorman_figures/__init__.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/snowfall fraction of total precipitation/__init__.py rename to projects/ogorman/gorman_figures/__init__.py diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/daily_snowfall_fraction.py b/projects/ogorman/gorman_figures/daily_snowfall_fraction.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/daily_snowfall_fraction.py rename to projects/ogorman/gorman_figures/daily_snowfall_fraction.py diff --git a/projects/ogorman/gorman_figures/figure1/__init__.py b/projects/ogorman/gorman_figures/figure1/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/comparative_curve_wrt_altitude.py b/projects/ogorman/gorman_figures/figure1/comparative_curve_wrt_altitude.py similarity index 97% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/comparative_curve_wrt_altitude.py rename to projects/ogorman/gorman_figures/figure1/comparative_curve_wrt_altitude.py index 620a12e480c3315c0674f162d43b91e9279e590d..475494668a9c9def12c8ce6525bbb0fe681ba89a 100644 --- a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/comparative_curve_wrt_altitude.py +++ b/projects/ogorman/gorman_figures/figure1/comparative_curve_wrt_altitude.py @@ -6,7 +6,7 @@ import numpy as np from cached_property import cached_property -from projects.contrasting_trends_in_snow_loads.gorman_figures.figure1.study_visualizer_for_double_stationary_fit import \ +from projects.ogorman.gorman_figures.figure1.study_visualizer_for_double_stationary_fit import \ StudyVisualizerForReturnLevelChange diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py b/projects/ogorman/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py similarity index 82% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py rename to projects/ogorman/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py index 7bfecbeb663dd0213d1ca0522f4ba7a3319a40ca..51991de1f88a0fe7ca5565cabde972481a50aab3 100644 --- a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py +++ b/projects/ogorman/gorman_figures/figure1/figure1_mean_ratio_return_level_ratio.py @@ -1,16 +1,14 @@ from collections import OrderedDict -from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoad1Day, CrocusSnowLoad3Days, \ - CrocusSnowLoadTotal from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranSnowfall3Days, \ SafranSnowfall7Days, SafranSnowfall5Days from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import ALL_ALTITUDES_WITHOUT_NAN from extreme_fit.model.margin_model.utils import \ MarginFitMethod -from projects.contrasting_trends_in_snow_loads.gorman_figures.figure1.comparative_curve_wrt_altitude import \ +from projects.ogorman.gorman_figures.figure1 import \ ComparativeCurveWrtAltitude -from projects.contrasting_trends_in_snow_loads.gorman_figures.figure1.study_visualizer_for_double_stationary_fit import \ +from projects.ogorman.gorman_figures.figure1.study_visualizer_for_double_stationary_fit import \ StudyVisualizerForReturnLevelChange diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/result_from_stationary_fit.py b/projects/ogorman/gorman_figures/figure1/result_from_stationary_fit.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/result_from_stationary_fit.py rename to projects/ogorman/gorman_figures/figure1/result_from_stationary_fit.py diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py b/projects/ogorman/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py similarity index 94% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py rename to projects/ogorman/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py index 71ecc857fdd783c4549294d98038b17b401629fe..cd52f2fa7f1264a9e3f38c27663984a1e0c31f75 100644 --- a/projects/contrasting_trends_in_snow_loads/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py +++ b/projects/ogorman/gorman_figures/figure1/study_visualizer_for_double_stationary_fit.py @@ -1,19 +1,15 @@ import matplotlib 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 CrocusSnowLoad1Day, CrocusSnowLoad3Days, \ - CrocusSnowLoadTotal -from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranSnowfall3Days from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map, \ get_colors, ticks_values_and_labels_for_percentages -from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import ALL_ALTITUDES_WITHOUT_NAN from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer from extreme_fit.model.margin_model.utils import \ MarginFitMethod, fitmethod_to_str import matplotlib.pyplot as plt -from projects.contrasting_trends_in_snow_loads.gorman_figures.figure1.result_from_stationary_fit import \ +from projects.ogorman.gorman_figures.figure1 import \ ResultFromDoubleStationaryFit diff --git a/projects/contrasting_trends_in_snow_loads/gorman_figures/temperature_of_snowfall_maxima.py b/projects/ogorman/gorman_figures/temperature_of_snowfall_maxima.py similarity index 97% rename from projects/contrasting_trends_in_snow_loads/gorman_figures/temperature_of_snowfall_maxima.py rename to projects/ogorman/gorman_figures/temperature_of_snowfall_maxima.py index e6ff09c261c077d24e37e95fde86a57b5a9546db..913f51aa302203f01dcb825d03cc66112c9ef2fc 100644 --- a/projects/contrasting_trends_in_snow_loads/gorman_figures/temperature_of_snowfall_maxima.py +++ b/projects/ogorman/gorman_figures/temperature_of_snowfall_maxima.py @@ -11,7 +11,7 @@ import numpy as np from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranTemperature, \ SafranPrecipitation1Day -from projects.contrasting_trends_in_snow_loads.gorman_figures.daily_snowfall_fraction import \ +from projects.ogorman.gorman_figures.daily_snowfall_fraction import \ compute_daily_snowfall_fraction diff --git a/projects/ogorman/snowfall fraction of total precipitation/__init__.py b/projects/ogorman/snowfall fraction of total precipitation/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/projects/contrasting_trends_in_snow_loads/snowfall fraction of total precipitation/short_snow_load_partition.py b/projects/ogorman/snowfall fraction of total precipitation/short_snow_load_partition.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/snowfall fraction of total precipitation/short_snow_load_partition.py rename to projects/ogorman/snowfall fraction of total precipitation/short_snow_load_partition.py diff --git a/projects/others/__init__.py b/projects/others/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/projects/others/check_mcmc_convergence_for_return_levels/__init__.py b/projects/others/check_mcmc_convergence_for_return_levels/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py b/projects/others/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py rename to projects/others/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py diff --git a/projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py b/projects/others/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py rename to projects/others/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py diff --git a/projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py b/projects/others/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py similarity index 100% rename from projects/contrasting_trends_in_snow_loads/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py rename to projects/others/check_mcmc_convergence_for_return_levels/main_gelman_convergence_test.py diff --git a/test/test_projects/test_contrasting/test_altitudes_studies.py b/test/test_projects/test_contrasting/test_altitudes_studies.py index 8f437cb1ce8cebb0a4c518865a808e8001846fb6..a7a8c14e79c122c2f471ac53d133d5e1eea82200 100644 --- a/test/test_projects/test_contrasting/test_altitudes_studies.py +++ b/test/test_projects/test_contrasting/test_altitudes_studies.py @@ -1,11 +1,8 @@ import unittest from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day -from projects.contrasting_trends_in_snow_loads.altitudes_fit.altitudes_studies import AltitudesStudies -from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates -from spatio_temporal_dataset.slicer.split import Split, small_s_split_from_ratio -from spatio_temporal_dataset.slicer.temporal_slicer import TemporalSlicer -import pandas as pd +from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies +from spatio_temporal_dataset.slicer.split import Split class TestAltitudesStudies(unittest.TestCase): diff --git a/test/test_projects/test_contrasting/test_two_fold_datasets_generator.py b/test/test_projects/test_contrasting/test_two_fold_datasets_generator.py index 48c61a8a6bf735d3fd5200b15e410d3a8bb93f33..0cf0cb4675fa7650009e022a5ee467f4071f9db5 100644 --- a/test/test_projects/test_contrasting/test_two_fold_datasets_generator.py +++ b/test/test_projects/test_contrasting/test_two_fold_datasets_generator.py @@ -2,8 +2,8 @@ import unittest import numpy as np from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day -from projects.contrasting_trends_in_snow_loads.altitudes_fit.altitudes_studies import AltitudesStudies -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator +from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies +from projects.altitude_spatial_model.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator from spatio_temporal_dataset.slicer.split import Split diff --git a/test/test_projects/test_contrasting/test_two_fold_fit.py b/test/test_projects/test_contrasting/test_two_fold_fit.py index 7e07a95e943c35637c15066fdbb191f1f0892383..5f45ac3947fe3aec5873939700ac4bc2005a0325 100644 --- a/test/test_projects/test_contrasting/test_two_fold_fit.py +++ b/test/test_projects/test_contrasting/test_two_fold_fit.py @@ -1,18 +1,16 @@ import unittest -import unittest import numpy as np from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day -from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel, \ - LinearLocationAllDimsMarginModel +from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel from extreme_fit.model.margin_model.utils import MarginFitMethod from extreme_fit.model.utils import set_seed_for_test -from projects.contrasting_trends_in_snow_loads.altitudes_fit.altitudes_studies import AltitudesStudies -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_detail_fit import TwoFoldModelFit -from projects.contrasting_trends_in_snow_loads.altitudes_fit.two_fold_fit import TwoFoldFit -from projects.contrasting_trends_in_snow_loads.altitudes_fit.utils import Score +from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies +from projects.altitude_spatial_model.altitudes_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator +from projects.altitude_spatial_model.altitudes_fit.two_fold_detail_fit import TwoFoldModelFit +from projects.altitude_spatial_model.altitudes_fit.two_fold_fit import TwoFoldFit +from projects.altitude_spatial_model.altitudes_fit.utils import Score from spatio_temporal_dataset.slicer.split import Split