From bc1a043e2e45a96b8460bd54a3a6e91bd9cae9e6 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Wed, 18 Mar 2020 22:51:23 +0100
Subject: [PATCH] [refactor] remove trend analysis folder. create
extreme_trend_test folder
---
.../trend_test_three_parameters/__init__.py | 0
.../trend_test_two_parameters/__init__.py | 0
extreme_fit/estimator/margin_estimator/utils.py | 8 ++++++++
.../eurocode_return_level_uncertainties.py | 6 ++----
.../trend_analysis => extreme_trend_test}/__init__.py | 0
.../abstract_gev_trend_test.py | 4 ++--
.../trend_test_one_parameter}/__init__.py | 0
.../abstract_comparison_non_stationary_model.py | 5 ++---
.../gev_trend_test_one_parameter.py | 3 +--
.../gumbel_trend_test_one_parameter.py | 2 +-
.../trend_test_three_parameters}/__init__.py | 0
.../gev_trend_test_three_parameters.py | 9 ++-------
.../trend_test_two_parameters}/__init__.py | 0
.../gev_trend_test_two_parameters.py | 7 +++----
.../gumbel_test_two_parameters.py | 2 +-
.../gelman_convergence_test.py | 4 ++--
.../main_bayesian_mcmc.py | 6 +++---
projects/exceeding_snow_loads/paper_utils.py | 8 ++++----
.../study_visualizer_for_non_stationary_trends.py | 6 +++---
.../utils.py | 11 +++--------
test/test_experiment/test_SCM_study.py | 9 ++-------
.../test_gev/test_gev_temporal_extremes_bayesian.py | 2 +-
.../test_gev/test_gev_temporal_extremes_gumbel.py | 2 +-
.../test_gev/test_gev_temporal_extremes_mle.py | 2 +-
.../test_gev/test_gev_temporal_is_mev.py | 2 +-
.../test_model/test_confidence_interval.py | 8 ++------
26 files changed, 45 insertions(+), 61 deletions(-)
delete mode 100644 experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/__init__.py
delete mode 100644 experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/__init__.py
create mode 100644 extreme_fit/estimator/margin_estimator/utils.py
rename {experiment/trend_analysis => extreme_trend_test}/__init__.py (100%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/abstract_gev_trend_test.py (99%)
rename {experiment/trend_analysis/univariate_test => extreme_trend_test/trend_test_one_parameter}/__init__.py (100%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_one_parameter/abstract_comparison_non_stationary_model.py (80%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_one_parameter/gev_trend_test_one_parameter.py (96%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_one_parameter/gumbel_trend_test_one_parameter.py (97%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test/trend_test_three_parameters}/__init__.py (100%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_three_parameters/gev_trend_test_three_parameters.py (75%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter => extreme_trend_test/trend_test_two_parameters}/__init__.py (100%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_two_parameters/gev_trend_test_two_parameters.py (91%)
rename {experiment/trend_analysis/univariate_test/extreme_trend_test => extreme_trend_test}/trend_test_two_parameters/gumbel_test_two_parameters.py (93%)
rename {experiment/trend_analysis/univariate_test => spatio_temporal_dataset}/utils.py (77%)
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/__init__.py b/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/__init__.py b/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/extreme_fit/estimator/margin_estimator/utils.py b/extreme_fit/estimator/margin_estimator/utils.py
new file mode 100644
index 00000000..74e872a7
--- /dev/null
+++ b/extreme_fit/estimator/margin_estimator/utils.py
@@ -0,0 +1,8 @@
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+
+
+def fitted_linear_margin_estimator(model_class, coordinates, dataset, starting_year, fit_method, **model_kwargs):
+ model = model_class(coordinates, starting_point=starting_year, fit_method=fit_method, **model_kwargs)
+ estimator = LinearMarginEstimator(dataset, model)
+ estimator.fit()
+ return estimator
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 188381da..8b5b7459 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,10 +1,8 @@
-from enum import Enum
-
from experiment.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
-from experiment.trend_analysis.univariate_test.utils import load_temporal_coordinates_and_dataset, \
- fitted_linear_margin_estimator
+from spatio_temporal_dataset.utils import load_temporal_coordinates_and_dataset
from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
TemporalMarginFitMethod
diff --git a/experiment/trend_analysis/__init__.py b/extreme_trend_test/__init__.py
similarity index 100%
rename from experiment/trend_analysis/__init__.py
rename to extreme_trend_test/__init__.py
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py b/extreme_trend_test/abstract_gev_trend_test.py
similarity index 99%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py
rename to extreme_trend_test/abstract_gev_trend_test.py
index 7baee1ac..e77c563e 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/abstract_gev_trend_test.py
+++ b/extreme_trend_test/abstract_gev_trend_test.py
@@ -7,8 +7,7 @@ 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 experiment.trend_analysis.univariate_test.utils import load_temporal_coordinates_and_dataset, \
- fitted_linear_margin_estimator
+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 \
TemporalMarginFitMethod
@@ -17,6 +16,7 @@ from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_m
from extreme_fit.model.utils import SafeRunException
from root_utils import classproperty
from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
+from spatio_temporal_dataset.utils import load_temporal_coordinates_and_dataset
class AbstractGevTrendTest(object):
diff --git a/experiment/trend_analysis/univariate_test/__init__.py b/extreme_trend_test/trend_test_one_parameter/__init__.py
similarity index 100%
rename from experiment/trend_analysis/univariate_test/__init__.py
rename to extreme_trend_test/trend_test_one_parameter/__init__.py
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py b/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py
similarity index 80%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py
rename to extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py
index 8b38e5b4..55ab4704 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py
+++ b/extreme_trend_test/trend_test_one_parameter/abstract_comparison_non_stationary_model.py
@@ -1,8 +1,7 @@
from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \
+from extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \
GevTrendTestOneParameter
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest
+from extreme_trend_test.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/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py b/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py
similarity index 96%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py
rename to extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py
index 6b80b333..6f7b7978 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py
+++ b/extreme_trend_test/trend_test_one_parameter/gev_trend_test_one_parameter.py
@@ -1,12 +1,11 @@
from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
+from extreme_trend_test.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 \
NonStationaryLocationTemporalModel, NonStationaryScaleTemporalModel, NonStationaryShapeTemporalModel, \
StationaryTemporalModel
from extreme_fit.distribution.gev.gev_params import GevParams
-from root_utils import classproperty
class GevTrendTestOneParameter(AbstractGevTrendTest):
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py b/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py
similarity index 97%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py
rename to extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py
index cf2fcdb3..ac7359d1 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/gumbel_trend_test_one_parameter.py
+++ b/extreme_trend_test/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 experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \
+from extreme_trend_test.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/experiment/trend_analysis/univariate_test/extreme_trend_test/__init__.py b/extreme_trend_test/trend_test_three_parameters/__init__.py
similarity index 100%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/__init__.py
rename to extreme_trend_test/trend_test_three_parameters/__init__.py
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py b/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py
similarity index 75%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py
rename to extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py
index d552869b..7a7b643d 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py
+++ b/extreme_trend_test/trend_test_three_parameters/gev_trend_test_three_parameters.py
@@ -1,14 +1,9 @@
-from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.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 StationaryTemporalModel
from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
+from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
- NonStationaryLocationAndScaleTemporalModel, StationaryTemporalModel, NonStationaryLocationAndScaleGumbelModel, \
- GumbelTemporalModel
+ NonStationaryLocationAndScaleTemporalModel, GumbelTemporalModel
from extreme_fit.distribution.gev.gev_params import GevParams
from root_utils import classproperty
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/__init__.py b/extreme_trend_test/trend_test_two_parameters/__init__.py
similarity index 100%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_one_parameter/__init__.py
rename to extreme_trend_test/trend_test_two_parameters/__init__.py
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py b/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py
similarity index 91%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py
rename to extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py
index 265babf9..91cef298 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py
+++ b/extreme_trend_test/trend_test_two_parameters/gev_trend_test_two_parameters.py
@@ -1,12 +1,11 @@
from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \
+from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
+from extreme_trend_test.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
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
- NonStationaryLocationAndScaleTemporalModel, StationaryTemporalModel, NonStationaryLocationAndScaleGumbelModel, \
- GumbelTemporalModel
+ NonStationaryLocationAndScaleTemporalModel, StationaryTemporalModel, GumbelTemporalModel
from extreme_fit.distribution.gev.gev_params import GevParams
from root_utils import classproperty
diff --git a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py b/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py
similarity index 93%
rename from experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py
rename to extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py
index 975f90ce..b91f99ab 100644
--- a/experiment/trend_analysis/univariate_test/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py
+++ b/extreme_trend_test/trend_test_two_parameters/gumbel_test_two_parameters.py
@@ -1,5 +1,5 @@
from experiment.eurocode_data.utils import EUROCODE_QUANTILE
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import \
+from extreme_trend_test.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/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py b/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
index 238f1a97..0495452c 100644
--- a/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
+++ b/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/gelman_convergence_test.py
@@ -1,12 +1,12 @@
import numpy as np
import pandas as pd
-from experiment.trend_analysis.univariate_test.utils import load_temporal_coordinates_and_dataset, \
- fitted_linear_margin_estimator
+from extreme_fit.estimator.margin_estimator.utils 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.result_from_model_fit.result_from_extremes.result_from_bayesian_extremes import \
ResultFromBayesianExtremes
from extreme_fit.model.utils import r
+from spatio_temporal_dataset.utils import load_temporal_coordinates_and_dataset
def compute_gelman_score(means, variances, N, M):
diff --git a/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py b/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
index a3e0a051..b6fc9e48 100644
--- a/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
+++ b/projects/exceeding_snow_loads/check_mcmc_convergence_for_return_levels/main_bayesian_mcmc.py
@@ -2,12 +2,11 @@ import pandas as pd
import seaborn as sns
import matplotlib.pyplot as plt
-from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSwe3Days, CrocusSnowLoadTotal
+from experiment.meteo_france_data.scm_models_data.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 \
compute_gelman_score
-from experiment.trend_analysis.univariate_test.utils import load_temporal_coordinates_and_dataset, \
- fitted_linear_margin_estimator
+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 \
TemporalMarginFitMethod
@@ -16,6 +15,7 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra
ExtractEurocodeReturnLevelFromMyBayesianExtremes
from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
ConfidenceIntervalMethodFromExtremes
+from spatio_temporal_dataset.utils import load_temporal_coordinates_and_dataset
def main_drawing_bayesian(N=10000):
diff --git a/projects/exceeding_snow_loads/paper_utils.py b/projects/exceeding_snow_loads/paper_utils.py
index d3c419e5..a3dc7eff 100644
--- a/projects/exceeding_snow_loads/paper_utils.py
+++ b/projects/exceeding_snow_loads/paper_utils.py
@@ -4,13 +4,13 @@ from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSno
CrocusSnowLoad3Days
from experiment.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
+from extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
GumbelVersusGumbel, GumbelLocationTrendTest, GumbelScaleTrendTest, GevStationaryVersusGumbel
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_three_parameters.gev_trend_test_three_parameters import \
+from extreme_trend_test.trend_test_three_parameters.gev_trend_test_three_parameters import \
GevLocationAndScaleTrendTestAgainstGumbel
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import \
+from extreme_trend_test.trend_test_two_parameters.gev_trend_test_two_parameters import \
GevLocationAgainstGumbel, GevScaleAgainstGumbel
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \
+from extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \
GumbelLocationAndScaleTrendTest
paper_altitudes = ALL_ALTITUDES_WITHOUT_NAN
diff --git a/projects/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py b/projects/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
index bd44ceb5..8b2109f4 100644
--- a/projects/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
+++ b/projects/exceeding_snow_loads/study_visualizer_for_non_stationary_trends.py
@@ -18,10 +18,10 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer
from projects.exceeding_snow_loads.check_mcmc_convergence_for_return_levels.gelman_convergence_test import \
compute_gelman_convergence_value
from projects.exceeding_snow_loads.paper_utils import ModelSubsetForUncertainty, NON_STATIONARY_TREND_TEST_PAPER
-from experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
+from extreme_trend_test.abstract_gev_trend_test import AbstractGevTrendTest
+from extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
GumbelLocationTrendTest, GevStationaryVersusGumbel, GumbelScaleTrendTest, GumbelVersusGumbel
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \
+from extreme_trend_test.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/experiment/trend_analysis/univariate_test/utils.py b/spatio_temporal_dataset/utils.py
similarity index 77%
rename from experiment/trend_analysis/univariate_test/utils.py
rename to spatio_temporal_dataset/utils.py
index cd37c902..e295adb2 100644
--- a/experiment/trend_analysis/univariate_test/utils.py
+++ b/spatio_temporal_dataset/utils.py
@@ -1,3 +1,5 @@
+
+
import pandas as pd
from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
@@ -17,11 +19,4 @@ def load_temporal_coordinates_and_dataset(maxima, years):
observations = AbstractSpatioTemporalObservations(df_maxima_gev=df_maxima_gev)
coordinates = AbstractTemporalCoordinates.from_df(df, transformation_class=CenteredScaledNormalization)
dataset = AbstractDataset(observations=observations, coordinates=coordinates)
- return coordinates, dataset
-
-
-def fitted_linear_margin_estimator(model_class, coordinates, dataset, starting_year, fit_method, **model_kwargs):
- model = model_class(coordinates, starting_point=starting_year, fit_method=fit_method, **model_kwargs)
- estimator = LinearMarginEstimator(dataset, model)
- estimator.fit()
- return estimator
+ return coordinates, dataset
\ No newline at end of file
diff --git a/test/test_experiment/test_SCM_study.py b/test/test_experiment/test_SCM_study.py
index bed06ac8..d0bc0498 100644
--- a/test/test_experiment/test_SCM_study.py
+++ b/test/test_experiment/test_SCM_study.py
@@ -5,15 +5,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, ExtendedSafranSnowfall, \
- SafranTemperature, \
+from experiment.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 \
- study_iterator, study_iterator_global, SCM_STUDIES, ALL_ALTITUDES
-from experiment.meteo_france_data.scm_models_data.visualization.study_visualizer import \
- StudyVisualizer
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gev_trend_test_one_parameter import \
- GevLocationTrendTest
+ 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 d3e3a9e4..3799bf60 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 experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator
+from extreme_trend_test.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 018aeebb..43f90fd2 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 experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator
+from extreme_trend_test.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 88677c67..f8708022 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 experiment.trend_analysis.univariate_test.extreme_trend_test.abstract_gev_trend_test import fitted_linear_margin_estimator
+from extreme_trend_test.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_is_mev.py b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_is_mev.py
index 333cfd19..69196d43 100644
--- a/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_is_mev.py
+++ b/test/test_extreme_fit/test_distribution/test_gev/test_gev_temporal_is_mev.py
@@ -3,7 +3,7 @@ import unittest
import numpy as np
import pandas as pd
-from experiment.trend_analysis.univariate_test.utils import fitted_linear_margin_estimator
+from extreme_fit.estimator.margin_estimator.utils import fitted_linear_margin_estimator
from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
TemporalMarginFitMethod
diff --git a/test/test_extreme_fit/test_model/test_confidence_interval.py b/test/test_extreme_fit/test_model/test_confidence_interval.py
index 0f52b44d..00f2475d 100644
--- a/test/test_extreme_fit/test_model/test_confidence_interval.py
+++ b/test/test_extreme_fit/test_model/test_confidence_interval.py
@@ -3,11 +3,7 @@ import unittest
import numpy as np
import pandas as pd
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import \
- GumbelLocationTrendTest
-from experiment.trend_analysis.univariate_test.extreme_trend_test.trend_test_two_parameters.gumbel_test_two_parameters import \
- GumbelLocationAndScaleTrendTest
-from experiment.trend_analysis.univariate_test.utils import fitted_linear_margin_estimator
+from extreme_fit.estimator.margin_estimator.utils 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, \
@@ -17,7 +13,7 @@ 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_fit.model.utils import r, set_seed_r, set_seed_for_test
+from extreme_fit.model.utils import r, set_seed_for_test
from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_coordinates import \
AbstractTemporalCoordinates
--
GitLab