From b4c8c1216e2a87d1e14248a2c1ac0d4545fe81b4 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Thu, 25 Feb 2021 11:07:06 +0100
Subject: [PATCH] [refactor] move quantile regression project
---
.../AbstractSimulation.py | 0
.../quantile_regression_vs_evt/__init__.py | 0
.../annual_maxima_simulation/__init__.py | 0
.../abstract_annual_maxima_simulation.py | 2 +-
.../daily_exp_simulation.py | 2 +-
.../gev_simulation.py | 13 +------
...main_non_stationary_quantile_regression.py | 6 +--
.../test_annual_maxima_simulations.py | 37 ++-----------------
8 files changed, 9 insertions(+), 51 deletions(-)
rename projects/{ => archive}/quantile_regression_vs_evt/AbstractSimulation.py (100%)
rename projects/{ => archive}/quantile_regression_vs_evt/__init__.py (100%)
rename projects/{ => archive}/quantile_regression_vs_evt/annual_maxima_simulation/__init__.py (100%)
rename projects/{ => archive}/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py (96%)
rename projects/{ => archive}/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py (96%)
rename projects/{ => archive}/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py (74%)
rename projects/{ => archive}/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py (86%)
diff --git a/projects/quantile_regression_vs_evt/AbstractSimulation.py b/projects/archive/quantile_regression_vs_evt/AbstractSimulation.py
similarity index 100%
rename from projects/quantile_regression_vs_evt/AbstractSimulation.py
rename to projects/archive/quantile_regression_vs_evt/AbstractSimulation.py
diff --git a/projects/quantile_regression_vs_evt/__init__.py b/projects/archive/quantile_regression_vs_evt/__init__.py
similarity index 100%
rename from projects/quantile_regression_vs_evt/__init__.py
rename to projects/archive/quantile_regression_vs_evt/__init__.py
diff --git a/projects/quantile_regression_vs_evt/annual_maxima_simulation/__init__.py b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/__init__.py
similarity index 100%
rename from projects/quantile_regression_vs_evt/annual_maxima_simulation/__init__.py
rename to projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/__init__.py
diff --git a/projects/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py
similarity index 96%
rename from projects/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py
rename to projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py
index 1ba0cc19..a5fe0bd3 100644
--- a/projects/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py
+++ b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/abstract_annual_maxima_simulation.py
@@ -6,7 +6,7 @@ from cached_property import cached_property
from extreme_fit.estimator.quantile_estimator.abstract_quantile_estimator import AbstractQuantileEstimator
from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
-from projects.quantile_regression_vs_evt.AbstractSimulation import AbstractSimulation
+from projects.archive.quantile_regression_vs_evt.AbstractSimulation import AbstractSimulation
from spatio_temporal_dataset.spatio_temporal_observations.abstract_spatio_temporal_observations import \
AbstractSpatioTemporalObservations
diff --git a/projects/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py
similarity index 96%
rename from projects/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py
rename to projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py
index 5c2a76f8..119e29bf 100644
--- a/projects/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py
+++ b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/daily_exp_simulation.py
@@ -8,7 +8,7 @@ from extreme_fit.model.margin_model.utils import \
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_exp_models import \
NonStationaryRateTemporalModel
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.abstract_annual_maxima_simulation import \
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.abstract_annual_maxima_simulation import \
AnnualMaximaSimulation
from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.abstract_transformation import \
CenteredScaledNormalization
diff --git a/projects/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py
similarity index 74%
rename from projects/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py
rename to projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py
index 72864322..c75d3b76 100644
--- a/projects/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py
+++ b/projects/archive/quantile_regression_vs_evt/annual_maxima_simulation/gev_simulation.py
@@ -1,21 +1,10 @@
-from collections import OrderedDict
-from typing import List, Dict
-
-import numpy as np
-from cached_property import cached_property
-
from extreme_fit.distribution.gev.gev_params import GevParams
-from extreme_fit.estimator.quantile_estimator.abstract_quantile_estimator import AbstractQuantileEstimator
-from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
from extreme_fit.model.margin_model.utils import \
MarginFitMethod
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \
NonStationaryLocationTemporalModel
-from projects.quantile_regression_vs_evt.AbstractSimulation import AbstractSimulation
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.abstract_annual_maxima_simulation import \
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.abstract_annual_maxima_simulation import \
AnnualMaximaSimulation
-from spatio_temporal_dataset.spatio_temporal_observations.abstract_spatio_temporal_observations import \
- AbstractSpatioTemporalObservations
from spatio_temporal_dataset.spatio_temporal_observations.annual_maxima_observations import MarginAnnualMaxima
diff --git a/projects/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py b/projects/archive/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py
similarity index 86%
rename from projects/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py
rename to projects/archive/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py
index 2e6575b5..38b82da6 100644
--- a/projects/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py
+++ b/projects/archive/quantile_regression_vs_evt/main_non_stationary_quantile_regression.py
@@ -2,9 +2,9 @@ from extreme_fit.model.daily_data_model import TemporalCoordinatesQuantileRegres
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
NonStationaryLocationTemporalModel, NonStationaryLocationGumbelModel
from extreme_fit.model.quantile_model.quantile_regression_model import TemporalCoordinatesQuantileRegressionModel
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.daily_exp_simulation import \
- NonStationaryExpSimulation, StationaryExpSimulation
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.gev_simulation import \
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.daily_exp_simulation import \
+ NonStationaryExpSimulation
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.gev_simulation import \
NonStationaryLocationGumbelSimulation, NonStationaryLocationGevSimulation
from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.abstract_transformation import \
CenteredScaledNormalization, IdentityTransformation
diff --git a/test/test_projects/test_quantile_regression/test_annual_maxima_simulations.py b/test/test_projects/test_quantile_regression/test_annual_maxima_simulations.py
index cc4b9e75..673fcfc0 100644
--- a/test/test_projects/test_quantile_regression/test_annual_maxima_simulations.py
+++ b/test/test_projects/test_quantile_regression/test_annual_maxima_simulations.py
@@ -1,16 +1,12 @@
import unittest
-from extreme_fit.model.daily_data_model import ConstantQuantileRegressionModelOnDailyData, \
- TemporalCoordinatesQuantileRegressionModelOnDailyData
-from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_exp_models import \
- NonStationaryRateTemporalModel
from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryTemporalModel, \
NonStationaryLocationTemporalModel
from extreme_fit.model.quantile_model.quantile_regression_model import ConstantQuantileRegressionModel, \
TemporalCoordinatesQuantileRegressionModel
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.daily_exp_simulation import StationaryExpSimulation, \
- NonStationaryExpSimulation
-from projects.quantile_regression_vs_evt.annual_maxima_simulation.gev_simulation import StationarySimulation, \
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.daily_exp_simulation import \
+ StationaryExpSimulation, NonStationaryExpSimulation
+from projects.archive.quantile_regression_vs_evt.annual_maxima_simulation.gev_simulation import StationarySimulation, \
NonStationaryLocationGumbelSimulation
@@ -44,32 +40,5 @@ class TestExpSimulations(unittest.TestCase):
simulation.plot_error_for_last_year_quantile(self.DISPLAY)
-class TestExpSimulationsDailyDataModels(unittest.TestCase):
- DISPLAY = False
- pass
-
- # Warning this method is quite long...
- # def test_stationary_run_daily_data_quantile_regression_model(self):
- # simulation = StationaryExpSimulation(nb_time_series=1, quantile=0.5, time_series_lengths=[50, 60],
- # model_classes=[ConstantQuantileRegressionModelOnDailyData])
- # simulation.plot_error_for_last_year_quantile(self.DISPLAY)
-
- # def test_non_stationary_run_daily_data_quantile_regression_model(self):
- # simulation = NonStationaryExpSimulation(nb_time_series=1, quantile=0.5, time_series_lengths=[50, 60],
- # model_classes=[TemporalCoordinatesQuantileRegressionModelOnDailyData])
- # first_estimator = simulation.model_class_to_time_series_length_to_estimators[
- # TemporalCoordinatesQuantileRegressionModelOnDailyData][50][0]
- # self.assertEqual(len(first_estimator.dataset.df_dataset), 50 * 365)
- # simulation.plot_error_for_last_year_quantile(self.DISPLAY)
-
- # WARNING: It does not work yet, read fevd manual to understand how does he expect the parameters
- # probably the formula to provide should be w.r.t to the scale parameter
- # & there seems to be a need to be a need to provide a threshold parameter...
- # def test_stationary_run_daily_data_exponential_model(self):
- # simulation = StationaryExpSimulation(nb_time_series=1, quantile=0.5, time_series_lengths=[1, 2],
- # model_classes=[NonStationaryRateTemporalModel])
- # simulation.plot_error_for_last_year_quantile(self.DISPLAY)
-
-
if __name__ == '__main__':
unittest.main()
--
GitLab