From 124a132bf279182e3dacb7861a19013fe3aa0f7a Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Thu, 25 Feb 2021 12:57:25 +0100
Subject: [PATCH] [refactor] rename folders for one/two fold fit. move the code
for the anomaly into temperature_covariate.py
---
.../independent_ensemble_fit.py | 4 ++--
.../one_fold_fit_merge.py | 2 +-
.../visualizer_merge.py | 4 ++--
.../visualizer_for_sensitivity.py | 2 +-
.../__init__.py | 0
.../altitude_group.py | 0
...es_visualizer_for_non_stationary_models.py | 6 +++---
.../one_fold_fit.py | 7 ++++---
.../plots/__init__.py | 0
...pute_histogram_change_in_total_snowfall.py | 2 +-
.../plots/plot_coherence_curves.py | 4 ++--
.../plots/plot_histogram_altitude_studies.py | 6 +++---
.../utils_altitude_studies_visualizer.py | 0
.../__init__.py | 0
.../two_fold_datasets_generator.py | 0
.../two_fold_detail_fit.py | 2 +-
.../two_fold_fit.py | 6 +++---
.../utils.py | 0
.../main_gap_altitudes_studies.py | 2 +-
.../main_season_repartition_of_maxima.py | 2 +-
.../main_altitudes_studies.py | 8 ++++----
.../preliminary_analysis.py | 2 +-
...ation_temporal_for_projections_ensemble.py | 11 ++++++-----
.../abstract_temporal_covariate_for_fit.py | 19 +------------------
.../temperature_covariate.py | 18 ++++++++++++++++++
.../test_gev_spatio_temporal_extremes_mle.py | 4 ++--
test/test_extreme_trend/test_one_fold_fit.py | 8 +++++---
test/test_extreme_trend/test_two_fold_fit.py | 8 ++++----
28 files changed, 66 insertions(+), 61 deletions(-)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/__init__.py (100%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/altitude_group.py (100%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/altitudes_studies_visualizer_for_non_stationary_models.py (99%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/one_fold_fit.py (98%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/plots/__init__.py (100%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/plots/compute_histogram_change_in_total_snowfall.py (96%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/plots/plot_coherence_curves.py (98%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/plots/plot_histogram_altitude_studies.py (97%)
rename extreme_trend/{one_fold_analysis => one_fold_fit}/utils_altitude_studies_visualizer.py (100%)
rename extreme_trend/{two_fold_analysis => two_fold_fit}/__init__.py (100%)
rename extreme_trend/{two_fold_analysis => two_fold_fit}/two_fold_datasets_generator.py (100%)
rename extreme_trend/{two_fold_analysis => two_fold_fit}/two_fold_detail_fit.py (97%)
rename extreme_trend/{two_fold_analysis => two_fold_fit}/two_fold_fit.py (86%)
rename extreme_trend/{two_fold_analysis => two_fold_fit}/utils.py (100%)
diff --git a/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py b/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py
index 4e6c250b..be9eba5e 100644
--- a/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py
+++ b/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py
@@ -1,8 +1,8 @@
import numpy as np
-from extreme_trend.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
+from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
from extreme_trend.elevation_temporal_model_for_projections.abstract_ensemble_fit import \
AbstractEnsembleFit
from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \
diff --git a/extreme_trend/ensemble_fit/independent_ensemble_fit/one_fold_fit_merge.py b/extreme_trend/ensemble_fit/independent_ensemble_fit/one_fold_fit_merge.py
index 89a1d911..b1230df4 100644
--- a/extreme_trend/ensemble_fit/independent_ensemble_fit/one_fold_fit_merge.py
+++ b/extreme_trend/ensemble_fit/independent_ensemble_fit/one_fold_fit_merge.py
@@ -2,7 +2,7 @@ from typing import List
import numpy as np
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
class OneFoldFitMerge(OneFoldFit):
diff --git a/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py b/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py
index edd9cb75..b305af00 100644
--- a/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py
+++ b/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py
@@ -3,9 +3,9 @@ from typing import Dict, List
import numpy as np
from extreme_fit.model.margin_model.utils import MarginFitMethod
-from extreme_trend.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
+from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \
OneFoldFitMerge
diff --git a/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py b/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py
index 19c66626..cba512b8 100644
--- a/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py
+++ b/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py
@@ -12,7 +12,7 @@ from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble
IndependentEnsembleFit
from extreme_trend.elevation_temporal_model_for_projections.visualizer_for_projection_ensemble import \
VisualizerForProjectionEnsemble
-from extreme_trend.one_fold_analysis.altitude_group import get_altitude_class_from_altitudes, \
+from extreme_trend.one_fold_fit.altitude_group import get_altitude_class_from_altitudes, \
get_linestyle_for_altitude_class
diff --git a/extreme_trend/one_fold_analysis/__init__.py b/extreme_trend/one_fold_fit/__init__.py
similarity index 100%
rename from extreme_trend/one_fold_analysis/__init__.py
rename to extreme_trend/one_fold_fit/__init__.py
diff --git a/extreme_trend/one_fold_analysis/altitude_group.py b/extreme_trend/one_fold_fit/altitude_group.py
similarity index 100%
rename from extreme_trend/one_fold_analysis/altitude_group.py
rename to extreme_trend/one_fold_fit/altitude_group.py
diff --git a/extreme_trend/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py b/extreme_trend/one_fold_fit/altitudes_studies_visualizer_for_non_stationary_models.py
similarity index 99%
rename from extreme_trend/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py
rename to extreme_trend/one_fold_fit/altitudes_studies_visualizer_for_non_stationary_models.py
index bd35a265..1d637d27 100644
--- a/extreme_trend/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py
+++ b/extreme_trend/one_fold_fit/altitudes_studies_visualizer_for_non_stationary_models.py
@@ -20,12 +20,12 @@ from extreme_fit.model.margin_model.polynomial_margin_model.spatio_temporal_poly
AbstractSpatioTemporalPolynomialModel
from extreme_fit.model.margin_model.utils import MarginFitMethod
from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
-from extreme_trend.one_fold_analysis.altitude_group import \
+from extreme_trend.one_fold_fit.altitude_group import \
get_altitude_group_from_altitudes, VeyHighAltitudeGroup, MidAltitudeGroup
-from extreme_trend.one_fold_analysis.one_fold_fit import \
+from extreme_trend.one_fold_fit.one_fold_fit import \
OneFoldFit
from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
-from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \
+from spatio_temporal_dataset.coordinates.temporal_coordinates.temperature_covariate import \
AnomalyTemperatureTemporalCovariate
diff --git a/extreme_trend/one_fold_analysis/one_fold_fit.py b/extreme_trend/one_fold_fit/one_fold_fit.py
similarity index 98%
rename from extreme_trend/one_fold_analysis/one_fold_fit.py
rename to extreme_trend/one_fold_fit/one_fold_fit.py
index cf20cc0f..25d46145 100644
--- a/extreme_trend/one_fold_analysis/one_fold_fit.py
+++ b/extreme_trend/one_fold_fit/one_fold_fit.py
@@ -27,10 +27,11 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_int
ConfidenceIntervalMethodFromExtremes
from extreme_fit.model.result_from_model_fit.result_from_extremes.eurocode_return_level_uncertainties import \
EurocodeConfidenceIntervalFromExtremes
-from extreme_trend.one_fold_analysis.altitude_group import DefaultAltitudeGroup, altitudes_for_groups
+from extreme_trend.one_fold_fit.altitude_group import DefaultAltitudeGroup, altitudes_for_groups
from root_utils import NB_CORES, batch
-from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \
- AnomalyTemperatureTemporalCovariate, TimeTemporalCovariate
+from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import TimeTemporalCovariate
+from spatio_temporal_dataset.coordinates.temporal_coordinates.temperature_covariate import \
+ AnomalyTemperatureTemporalCovariate
from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
from spatio_temporal_dataset.slicer.split import Split
from spatio_temporal_dataset.spatio_temporal_observations.annual_maxima_observations import AnnualMaxima
diff --git a/extreme_trend/one_fold_analysis/plots/__init__.py b/extreme_trend/one_fold_fit/plots/__init__.py
similarity index 100%
rename from extreme_trend/one_fold_analysis/plots/__init__.py
rename to extreme_trend/one_fold_fit/plots/__init__.py
diff --git a/extreme_trend/one_fold_analysis/plots/compute_histogram_change_in_total_snowfall.py b/extreme_trend/one_fold_fit/plots/compute_histogram_change_in_total_snowfall.py
similarity index 96%
rename from extreme_trend/one_fold_analysis/plots/compute_histogram_change_in_total_snowfall.py
rename to extreme_trend/one_fold_fit/plots/compute_histogram_change_in_total_snowfall.py
index 2bc2fd99..4445865c 100644
--- a/extreme_trend/one_fold_analysis/plots/compute_histogram_change_in_total_snowfall.py
+++ b/extreme_trend/one_fold_fit/plots/compute_histogram_change_in_total_snowfall.py
@@ -4,7 +4,7 @@ import numpy as np
from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall
from extreme_fit.utils import fit_linear_regression
-from extreme_trend.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
+from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels
diff --git a/extreme_trend/one_fold_analysis/plots/plot_coherence_curves.py b/extreme_trend/one_fold_fit/plots/plot_coherence_curves.py
similarity index 98%
rename from extreme_trend/one_fold_analysis/plots/plot_coherence_curves.py
rename to extreme_trend/one_fold_fit/plots/plot_coherence_curves.py
index a8ea0a5c..6cc4e227 100644
--- a/extreme_trend/one_fold_analysis/plots/plot_coherence_curves.py
+++ b/extreme_trend/one_fold_fit/plots/plot_coherence_curves.py
@@ -4,9 +4,9 @@ import numpy as np
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
AbstractExtractEurocodeReturnLevel
-from extreme_trend.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
+from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
def plot_coherence_curves(massif_names, visualizer_list: List[AltitudesStudiesVisualizerForNonStationaryModels]):
diff --git a/extreme_trend/one_fold_analysis/plots/plot_histogram_altitude_studies.py b/extreme_trend/one_fold_fit/plots/plot_histogram_altitude_studies.py
similarity index 97%
rename from extreme_trend/one_fold_analysis/plots/plot_histogram_altitude_studies.py
rename to extreme_trend/one_fold_fit/plots/plot_histogram_altitude_studies.py
index ba79292c..3fa0eab2 100644
--- a/extreme_trend/one_fold_analysis/plots/plot_histogram_altitude_studies.py
+++ b/extreme_trend/one_fold_fit/plots/plot_histogram_altitude_studies.py
@@ -13,10 +13,10 @@ from matplotlib.lines import Line2D
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
AbstractExtractEurocodeReturnLevel
-from extreme_trend.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
+from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
-from extreme_trend.one_fold_analysis.plots.compute_histogram_change_in_total_snowfall import \
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.plots.compute_histogram_change_in_total_snowfall import \
compute_changes_in_total_snowfall
diff --git a/extreme_trend/one_fold_analysis/utils_altitude_studies_visualizer.py b/extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py
similarity index 100%
rename from extreme_trend/one_fold_analysis/utils_altitude_studies_visualizer.py
rename to extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py
diff --git a/extreme_trend/two_fold_analysis/__init__.py b/extreme_trend/two_fold_fit/__init__.py
similarity index 100%
rename from extreme_trend/two_fold_analysis/__init__.py
rename to extreme_trend/two_fold_fit/__init__.py
diff --git a/extreme_trend/two_fold_analysis/two_fold_datasets_generator.py b/extreme_trend/two_fold_fit/two_fold_datasets_generator.py
similarity index 100%
rename from extreme_trend/two_fold_analysis/two_fold_datasets_generator.py
rename to extreme_trend/two_fold_fit/two_fold_datasets_generator.py
diff --git a/extreme_trend/two_fold_analysis/two_fold_detail_fit.py b/extreme_trend/two_fold_fit/two_fold_detail_fit.py
similarity index 97%
rename from extreme_trend/two_fold_analysis/two_fold_detail_fit.py
rename to extreme_trend/two_fold_fit/two_fold_detail_fit.py
index 501a8145..852213de 100644
--- a/extreme_trend/two_fold_analysis/two_fold_detail_fit.py
+++ b/extreme_trend/two_fold_fit/two_fold_detail_fit.py
@@ -4,7 +4,7 @@ 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 extreme_trend.two_fold_analysis.utils import Grouping, get_key_with_min_value, Score
+from extreme_trend.two_fold_fit.utils import Grouping, get_key_with_min_value, Score
from spatio_temporal_dataset.slicer.split import Split
diff --git a/extreme_trend/two_fold_analysis/two_fold_fit.py b/extreme_trend/two_fold_fit/two_fold_fit.py
similarity index 86%
rename from extreme_trend/two_fold_analysis/two_fold_fit.py
rename to extreme_trend/two_fold_fit/two_fold_fit.py
index 49ae85e5..dee938a2 100644
--- a/extreme_trend/two_fold_analysis/two_fold_fit.py
+++ b/extreme_trend/two_fold_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 extreme_trend.two_fold_analysis.two_fold_datasets_generator import TwoFoldDatasetsGenerator
-from extreme_trend.two_fold_analysis.two_fold_detail_fit import TwoFoldMassifFit
-from extreme_trend.two_fold_analysis.utils import Score, Grouping
+from extreme_trend.two_fold_fit.two_fold_datasets_generator import TwoFoldDatasetsGenerator
+from extreme_trend.two_fold_fit.two_fold_detail_fit import TwoFoldMassifFit
+from extreme_trend.two_fold_fit.utils import Score, Grouping
class TwoFoldFit(object):
diff --git a/extreme_trend/two_fold_analysis/utils.py b/extreme_trend/two_fold_fit/utils.py
similarity index 100%
rename from extreme_trend/two_fold_analysis/utils.py
rename to extreme_trend/two_fold_fit/utils.py
diff --git a/projects/archive/gap_between_my_safran2019_and_safran_2019/main_gap_altitudes_studies.py b/projects/archive/gap_between_my_safran2019_and_safran_2019/main_gap_altitudes_studies.py
index 54c89cc6..8fc4bf20 100644
--- a/projects/archive/gap_between_my_safran2019_and_safran_2019/main_gap_altitudes_studies.py
+++ b/projects/archive/gap_between_my_safran2019_and_safran_2019/main_gap_altitudes_studies.py
@@ -20,7 +20,7 @@ from extreme_fit.model.utils import set_seed_for_test
mpl.rcParams['text.usetex'] = True
mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
-from extreme_trend.one_fold_analysis.altitude_group import altitudes_for_groups
+from extreme_trend.one_fold_fit.altitude_group import altitudes_for_groups
from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranSnowfall3Days, \
SafranSnowfall5Days, SafranSnowfall7Days
diff --git a/projects/archive/seasonal_analysis/main_season_repartition_of_maxima.py b/projects/archive/seasonal_analysis/main_season_repartition_of_maxima.py
index 9eda27ac..a1da50b0 100644
--- a/projects/archive/seasonal_analysis/main_season_repartition_of_maxima.py
+++ b/projects/archive/seasonal_analysis/main_season_repartition_of_maxima.py
@@ -6,7 +6,7 @@ import numpy as np
from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day
from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
-from extreme_trend.one_fold_analysis.altitude_group import altitudes_for_groups, \
+from extreme_trend.one_fold_fit.altitude_group import altitudes_for_groups, \
get_altitude_group_from_altitudes
diff --git a/projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py b/projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py
index 2112dd3e..bef9ed2e 100644
--- a/projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py
+++ b/projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py
@@ -5,7 +5,7 @@ from typing import List
import matplotlib as mpl
-from extreme_trend.one_fold_analysis.utils_altitude_studies_visualizer import load_visualizer_list
+from extreme_trend.one_fold_fit.utils_altitude_studies_visualizer import load_visualizer_list
mpl.rcParams['text.usetex'] = True
mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
@@ -13,7 +13,7 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
import matplotlib
matplotlib.use('Agg')
-from extreme_trend.one_fold_analysis.plots.plot_histogram_altitude_studies import \
+from extreme_trend.one_fold_fit.plots.plot_histogram_altitude_studies import \
plot_shoe_plot_changes_against_altitude, plot_histogram_all_trends_against_altitudes, \
plot_histogram_all_models_against_altitudes
@@ -23,10 +23,10 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra
from extreme_fit.model.utils import set_seed_for_test
-from extreme_trend.one_fold_analysis.plots.plot_coherence_curves import plot_coherence_curves
+from extreme_trend.one_fold_fit.plots.plot_coherence_curves import plot_coherence_curves
-from extreme_trend.one_fold_analysis.altitude_group import altitudes_for_groups
+from extreme_trend.one_fold_fit.altitude_group import altitudes_for_groups
from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day, SafranSnowfall3Days, \
SafranSnowfall5Days, SafranSnowfall7Days
diff --git a/projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py b/projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py
index 6028ea83..e3387ead 100644
--- a/projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py
+++ b/projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py
@@ -14,7 +14,7 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualiz
from extreme_fit.distribution.gev.gev_params import GevParams
from extreme_fit.utils import fit_linear_regression
from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
-from extreme_trend.one_fold_analysis.altitude_group import altitudes_for_groups
+from extreme_trend.one_fold_fit.altitude_group import altitudes_for_groups
class PointwiseGevStudyVisualizer(AltitudesStudies):
diff --git a/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py b/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py
index eb0cf07d..d991d926 100644
--- a/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py
+++ b/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py
@@ -7,6 +7,10 @@ import matplotlib as mpl
from extreme_trend.elevation_temporal_model_for_projections.visualizer_for_sensitivity import \
VisualizerForSensivity
+from extreme_trend.ensemble_fit.independent_ensemble_fit.independent_ensemble_fit import IndependentEnsembleFit
+from spatio_temporal_dataset.coordinates.temporal_coordinates.temperature_covariate import \
+ AnomalyTemperatureTemporalCovariate
+
mpl.rcParams['text.usetex'] = True
mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
@@ -20,17 +24,14 @@ from extreme_fit.model.utils import set_seed_for_test
from extreme_data.meteo_france_data.adamont_data.adamont.adamont_snowfall import AdamontSnowfall
from extreme_data.meteo_france_data.adamont_data.adamont_scenario import AdamontScenario, get_gcm_rcm_couples, \
rcp_scenarios
-from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \
- IndependentEnsembleFit
-from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \
- AnomalyTemperatureTemporalCovariate, TimeTemporalCovariate
+from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import TimeTemporalCovariate
matplotlib.use('Agg')
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
AbstractExtractEurocodeReturnLevel
-from extreme_trend.one_fold_analysis.altitude_group import altitudes_for_groups
+from extreme_trend.one_fold_fit.altitude_group import altitudes_for_groups
from extreme_data.meteo_france_data.scm_models_data.utils import Season
diff --git a/spatio_temporal_dataset/coordinates/temporal_coordinates/abstract_temporal_covariate_for_fit.py b/spatio_temporal_dataset/coordinates/temporal_coordinates/abstract_temporal_covariate_for_fit.py
index 4fdc65eb..cd36bcd9 100644
--- a/spatio_temporal_dataset/coordinates/temporal_coordinates/abstract_temporal_covariate_for_fit.py
+++ b/spatio_temporal_dataset/coordinates/temporal_coordinates/abstract_temporal_covariate_for_fit.py
@@ -16,21 +16,4 @@ class TimeTemporalCovariate(AbstractTemporalCovariateForFit):
@classmethod
def get_temporal_covariate(cls, row: pd.Series):
- return row[AbstractCoordinates.COORDINATE_T]
-
-
-class AnomalyTemperatureTemporalCovariate(AbstractTemporalCovariateForFit):
- gcm_and_scenario_to_d = {}
-
- @classmethod
- def get_temporal_covariate(cls, row: pd.Series):
- year = row[AbstractCoordinates.COORDINATE_T]
- gcm = row[AbstractCoordinates.COORDINATE_GCM]
- scenario_str = row[AbstractCoordinates.COORDINATE_RCP]
- scenario = str_to_scenario(scenario_str)
- if (gcm, scenario) not in cls.gcm_and_scenario_to_d:
- d = year_to_global_mean_temp(gcm, scenario, anomaly=True)
- cls.gcm_and_scenario_to_d[(gcm, scenario)] = d
- d = cls.gcm_and_scenario_to_d[(gcm, scenario)]
- global_mean_temp = d[year]
- return global_mean_temp
+ return row[AbstractCoordinates.COORDINATE_T]
\ No newline at end of file
diff --git a/spatio_temporal_dataset/coordinates/temporal_coordinates/temperature_covariate.py b/spatio_temporal_dataset/coordinates/temporal_coordinates/temperature_covariate.py
index 5b5cd7b5..56d7e2d5 100644
--- a/spatio_temporal_dataset/coordinates/temporal_coordinates/temperature_covariate.py
+++ b/spatio_temporal_dataset/coordinates/temporal_coordinates/temperature_covariate.py
@@ -1,3 +1,5 @@
+from extreme_data.meteo_france_data.adamont_data.adamont_scenario import str_to_scenario
+from extreme_data.meteo_france_data.adamont_data.cmip5.climate_explorer_cimp5 import year_to_global_mean_temp
from extreme_data.meteo_france_data.mean_alps_temperature import load_year_to_mean_alps_temperatures
from extreme_data.nasa_data.global_mean_temperature import load_year_to_mean_global_temperature
from root_utils import classproperty
@@ -41,3 +43,19 @@ class MeanAlpsTemperatureCovariate(AbstractTemperatureCovariate):
@classmethod
def load_year_to_temperature_covariate(cls):
return load_year_to_mean_alps_temperatures()
+
+class AnomalyTemperatureTemporalCovariate(AbstractTemporalCovariateForFit):
+ gcm_and_scenario_to_d = {}
+
+ @classmethod
+ def get_temporal_covariate(cls, row: pd.Series):
+ year = row[AbstractCoordinates.COORDINATE_T]
+ gcm = row[AbstractCoordinates.COORDINATE_GCM]
+ scenario_str = row[AbstractCoordinates.COORDINATE_RCP]
+ scenario = str_to_scenario(scenario_str)
+ if (gcm, scenario) not in cls.gcm_and_scenario_to_d:
+ d = year_to_global_mean_temp(gcm, scenario, anomaly=True)
+ cls.gcm_and_scenario_to_d[(gcm, scenario)] = d
+ d = cls.gcm_and_scenario_to_d[(gcm, scenario)]
+ global_mean_temp = d[year]
+ return global_mean_temp
diff --git a/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py b/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py
index 9220b1f5..b9fe08c6 100644
--- a/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py
+++ b/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py
@@ -4,9 +4,9 @@ from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranS
from extreme_fit.model.margin_model.utils import \
MarginFitMethod
from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
-from extreme_trend.two_fold_analysis.two_fold_datasets_generator import \
+from extreme_trend.two_fold_fit.two_fold_datasets_generator import \
TwoFoldDatasetsGenerator
-from extreme_trend.two_fold_analysis.two_fold_fit import TwoFoldFit
+from extreme_trend.two_fold_fit.two_fold_fit import TwoFoldFit
class TestGevTemporalQuadraticExtremesMle(unittest.TestCase):
diff --git a/test/test_extreme_trend/test_one_fold_fit.py b/test/test_extreme_trend/test_one_fold_fit.py
index 54d7c8b0..e4e2a546 100644
--- a/test/test_extreme_trend/test_one_fold_fit.py
+++ b/test/test_extreme_trend/test_one_fold_fit.py
@@ -11,10 +11,12 @@ from extreme_fit.model.margin_model.polynomial_margin_model.models_based_on_pari
from extreme_fit.model.margin_model.polynomial_margin_model.utils import \
ALTITUDINAL_GEV_MODELS_BASED_ON_POINTWISE_ANALYSIS
from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
-from extreme_trend.one_fold_analysis.altitude_group import VeyHighAltitudeGroup
-from extreme_trend.one_fold_analysis.one_fold_fit import OneFoldFit
+from extreme_trend.one_fold_fit.altitude_group import VeyHighAltitudeGroup
+from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit
from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \
- TimeTemporalCovariate, AnomalyTemperatureTemporalCovariate
+ TimeTemporalCovariate
+from spatio_temporal_dataset.coordinates.temporal_coordinates.temperature_covariate import \
+ AnomalyTemperatureTemporalCovariate
class TestOneFoldFit(unittest.TestCase):
diff --git a/test/test_extreme_trend/test_two_fold_fit.py b/test/test_extreme_trend/test_two_fold_fit.py
index 3a9cc919..2963d297 100644
--- a/test/test_extreme_trend/test_two_fold_fit.py
+++ b/test/test_extreme_trend/test_two_fold_fit.py
@@ -7,11 +7,11 @@ from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranS
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 extreme_trend.two_fold_analysis.two_fold_datasets_generator import \
+from extreme_trend.two_fold_fit.two_fold_datasets_generator import \
TwoFoldDatasetsGenerator
-from extreme_trend.two_fold_analysis.two_fold_detail_fit import TwoFoldModelFit
-from extreme_trend.two_fold_analysis.two_fold_fit import TwoFoldFit
-from extreme_trend.two_fold_analysis.utils import Score
+from extreme_trend.two_fold_fit.two_fold_detail_fit import TwoFoldModelFit
+from extreme_trend.two_fold_fit.two_fold_fit import TwoFoldFit
+from extreme_trend.two_fold_fit.utils import Score
from spatio_temporal_dataset.slicer.split import Split
--
GitLab