From 59f359d3da4037006476554ba0eec42ac708607e Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Tue, 13 Nov 2018 18:16:14 +0100
Subject: [PATCH] [FIX TESTS] fix imports for global tests. refactor some code.
---
.../R_fit}/__init__.py | 0
.../R_fit/gev_fit}/__init__.py | 0
.../R_fit/max_stable_fit/__init__.py | 0
extreme_estimator/__init__.py | 0
extreme_estimator/estimator/full_estimator.py | 2 --
.../alps_station_2D_coordinates.py | 4 ++--
.../transformed_coordinates.py | 6 +++---
.../test_temporal_observations.py | 15 ---------------
test/test_extreme_estimator/__init__.py | 0
.../test_full_estimators.py | 12 +++++-------
.../test_margin_estimators.py | 0
.../test_max_stable_estimators.py | 0
test/test_spatio_temporal_dataset/__init__.py | 0
.../test_spatial_coordinates.py | 0
.../test_temporal_observations.py | 9 +++++++++
15 files changed, 19 insertions(+), 29 deletions(-)
rename {test/extreme_estimator => extreme_estimator/R_fit}/__init__.py (100%)
rename {test/spatio_temporal_dataset => extreme_estimator/R_fit/gev_fit}/__init__.py (100%)
create mode 100644 extreme_estimator/R_fit/max_stable_fit/__init__.py
create mode 100644 extreme_estimator/__init__.py
delete mode 100644 test/spatio_temporal_dataset/test_temporal_observations.py
create mode 100644 test/test_extreme_estimator/__init__.py
rename test/{extreme_estimator => test_extreme_estimator}/test_full_estimators.py (75%)
rename test/{extreme_estimator => test_extreme_estimator}/test_margin_estimators.py (100%)
rename test/{extreme_estimator => test_extreme_estimator}/test_max_stable_estimators.py (100%)
create mode 100644 test/test_spatio_temporal_dataset/__init__.py
rename test/{spatio_temporal_dataset => test_spatio_temporal_dataset}/test_spatial_coordinates.py (100%)
create mode 100644 test/test_spatio_temporal_dataset/test_temporal_observations.py
diff --git a/test/extreme_estimator/__init__.py b/extreme_estimator/R_fit/__init__.py
similarity index 100%
rename from test/extreme_estimator/__init__.py
rename to extreme_estimator/R_fit/__init__.py
diff --git a/test/spatio_temporal_dataset/__init__.py b/extreme_estimator/R_fit/gev_fit/__init__.py
similarity index 100%
rename from test/spatio_temporal_dataset/__init__.py
rename to extreme_estimator/R_fit/gev_fit/__init__.py
diff --git a/extreme_estimator/R_fit/max_stable_fit/__init__.py b/extreme_estimator/R_fit/max_stable_fit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/extreme_estimator/__init__.py b/extreme_estimator/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/extreme_estimator/estimator/full_estimator.py b/extreme_estimator/estimator/full_estimator.py
index 907ba60f..b5f226f1 100644
--- a/extreme_estimator/estimator/full_estimator.py
+++ b/extreme_estimator/estimator/full_estimator.py
@@ -23,10 +23,8 @@ class SmoothMarginalsThenUnitaryMsp(AbstractFullEstimator):
# Estimate the margin parameters
self.margin_estimator.fit()
# Compute the maxima_frech
- print(self.dataset.maxima_gev)
maxima_frech = self.margin_estimator.margin_model.gev2frech(maxima_gev=self.dataset.maxima_gev,
df_gev_params=self.margin_estimator.df_gev_params)
- print(maxima_frech)
# Update maxima frech field through the dataset object
self.dataset.maxima_frech = maxima_frech
# Estimate the max stable parameters
diff --git a/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py b/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py
index aa88ff30..a85efb22 100644
--- a/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py
+++ b/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py
@@ -9,8 +9,8 @@ class AlpsStation2DCoordinates(AlpsStation3DCoordinates):
@classmethod
def from_csv(cls, csv_file='coord-lambert2'):
# Remove the Z coordinates from df_coord
- spatial_coordinates = super().from_csv(csv_file)
- spatial_coordinates.df_coord.drop(cls.COORD_Z, axis=1, inplace=True)
+ spatial_coordinates = super().from_csv(csv_file) # type: AlpsStation3DCoordinates
+ spatial_coordinates.df_coordinates.drop(cls.COORD_Z, axis=1, inplace=True)
return spatial_coordinates
diff --git a/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py b/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py
index 8f38066c..c2f99ac7 100644
--- a/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py
+++ b/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py
@@ -7,8 +7,8 @@ class TransformedCoordinates(AbstractSpatialCoordinates):
@classmethod
def from_coordinates(cls, spatial_coordinates: AbstractSpatialCoordinates,
transformation_function: AbstractTransformation):
- df_coord_transformed = spatial_coordinates.df_coordinates.copy()
- df_coord_transformed = transformation_function.transform(df_coord=df_coord_transformed)
- return cls(df_coord=df_coord_transformed, s_split=spatial_coordinates.s_split)
+ df_coordinates_transformed = spatial_coordinates.df_coordinates.copy()
+ df_coordinates_transformed = transformation_function.transform(df_coord=df_coordinates_transformed)
+ return cls(df_coordinates=df_coordinates_transformed, s_split=spatial_coordinates.s_split)
diff --git a/test/spatio_temporal_dataset/test_temporal_observations.py b/test/spatio_temporal_dataset/test_temporal_observations.py
deleted file mode 100644
index 0ffd7305..00000000
--- a/test/spatio_temporal_dataset/test_temporal_observations.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import unittest
-
-from spatio_temporal_dataset.spatial_coordinates.alps_station_2D_coordinates import \
- AlpsStation2DCoordinatesBetweenZeroAndOne
-from spatio_temporal_dataset.spatial_coordinates.alps_station_3D_coordinates import \
- AlpsStation3DCoordinatesWithAnisotropy
-from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1
-
-
-class TestTemporalObservations(unittest.TestCase):
-
- DISPLAY = False
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/test/test_extreme_estimator/__init__.py b/test/test_extreme_estimator/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/extreme_estimator/test_full_estimators.py b/test/test_extreme_estimator/test_full_estimators.py
similarity index 75%
rename from test/extreme_estimator/test_full_estimators.py
rename to test/test_extreme_estimator/test_full_estimators.py
index 9ec15296..2a9aa6b3 100644
--- a/test/extreme_estimator/test_full_estimators.py
+++ b/test/test_extreme_estimator/test_full_estimators.py
@@ -1,12 +1,11 @@
import unittest
+from itertools import product
-from extreme_estimator.estimator.full_estimator import FullEstimatorInASingleStep, \
- FullEstimatorInASingleStepWithSmoothMarginals, SmoothMarginalsThenUnitaryMsp
-from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset, FullSimulatedDataset
+from extreme_estimator.estimator.full_estimator import SmoothMarginalsThenUnitaryMsp
+from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1
-from test.extreme_estimator.test_margin_estimators import TestMarginEstimators
-from test.extreme_estimator.test_max_stable_estimators import TestMaxStableEstimators
-from itertools import product
+from test.test_extreme_estimator.test_margin_estimators import TestMarginEstimators
+from test.test_extreme_estimator.test_max_stable_estimators import TestMaxStableEstimators
class TestFullEstimators(unittest.TestCase):
@@ -20,7 +19,6 @@ class TestFullEstimators(unittest.TestCase):
self.margin_models = TestMarginEstimators.load_margin_models()
def test_full_estimators(self):
- print(self.margin_models, self.max_stable_models)
for margin_model, max_stable_model in product(self.margin_models, self.max_stable_models):
dataset = FullSimulatedDataset.from_double_sampling(nb_obs=10, margin_model=margin_model,
spatial_coordinates=self.spatial_coord,
diff --git a/test/extreme_estimator/test_margin_estimators.py b/test/test_extreme_estimator/test_margin_estimators.py
similarity index 100%
rename from test/extreme_estimator/test_margin_estimators.py
rename to test/test_extreme_estimator/test_margin_estimators.py
diff --git a/test/extreme_estimator/test_max_stable_estimators.py b/test/test_extreme_estimator/test_max_stable_estimators.py
similarity index 100%
rename from test/extreme_estimator/test_max_stable_estimators.py
rename to test/test_extreme_estimator/test_max_stable_estimators.py
diff --git a/test/test_spatio_temporal_dataset/__init__.py b/test/test_spatio_temporal_dataset/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/spatio_temporal_dataset/test_spatial_coordinates.py b/test/test_spatio_temporal_dataset/test_spatial_coordinates.py
similarity index 100%
rename from test/spatio_temporal_dataset/test_spatial_coordinates.py
rename to test/test_spatio_temporal_dataset/test_spatial_coordinates.py
diff --git a/test/test_spatio_temporal_dataset/test_temporal_observations.py b/test/test_spatio_temporal_dataset/test_temporal_observations.py
new file mode 100644
index 00000000..3e0657da
--- /dev/null
+++ b/test/test_spatio_temporal_dataset/test_temporal_observations.py
@@ -0,0 +1,9 @@
+import unittest
+
+
+class TestTemporalObservations(unittest.TestCase):
+ DISPLAY = False
+
+
+if __name__ == '__main__':
+ unittest.main()
--
GitLab