diff --git a/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py b/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py index 4d4f62625a0f70948521894435857ae920ce4bcd..46d04cecb7ee211bb349cfc2bb282ed18e9610f6 100644 --- a/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py +++ b/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py @@ -3,7 +3,7 @@ import numpy as np from extreme_estimator.extreme_models.abstract_model import AbstractModel from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import AbstractMarginFunction from extreme_estimator.gev_params import GevParams -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates class AbstractMarginModel(AbstractModel): diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py b/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py index ef0928c8e15a4efda995fe7a359dac5c839dd536..865aee3042147b897168c58d5bf5ebd062fced91 100644 --- a/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py +++ b/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py @@ -3,7 +3,7 @@ import matplotlib.pyplot as plt import numpy as np from extreme_estimator.gev_params import GevParams -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates class AbstractMarginFunction(object): diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py b/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py index 422a35848fda151da21122e028b5ab4c77a9dfe9..dc7d27c53c7e6745127ee55fac776af7aa2535b5 100644 --- a/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py +++ b/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py @@ -7,7 +7,7 @@ from extreme_estimator.extreme_models.margin_model.margin_function.param_functio from extreme_estimator.gev_params import GevParams from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \ AbstractMarginFunction -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates class IndependentMarginFunction(AbstractMarginFunction): diff --git a/extreme_estimator/extreme_models/max_stable_model/test.R b/extreme_estimator/extreme_models/max_stable_model/test.R index 64f29ab89fef278397278e49b9be32038a2f4456..35b31ee436929af9035e55fc63ee0192e6be3767 100644 --- a/extreme_estimator/extreme_models/max_stable_model/test.R +++ b/extreme_estimator/extreme_models/max_stable_model/test.R @@ -1,5 +1,5 @@ library(SpatialExtremes) -##Define the spatial_coordinates of each location +##Define the coordinates of each location n.site <- 30 locations <- matrix(runif(2*n.site, 0, 10), ncol = 2) colnames(locations) <- c("lon", "lat") diff --git a/extreme_estimator/robustness_plot/msp_robustness.py b/extreme_estimator/robustness_plot/msp_robustness.py index fa902d3d92041a7296ae86c9c3770608e5cde0a0..dc03ce853d4777337176b7a74ca9db661172cee5 100644 --- a/extreme_estimator/robustness_plot/msp_robustness.py +++ b/extreme_estimator/robustness_plot/msp_robustness.py @@ -1,16 +1,14 @@ -from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \ - CovarianceFunction -from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \ - ExtremalT +from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel +from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick from extreme_estimator.estimator.abstract_estimator import AbstractEstimator from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator from extreme_estimator.robustness_plot.multiple_plot import MultiplePlot from extreme_estimator.robustness_plot.single_plot import SinglePlot -from spatio_temporal_dataset.dataset.simulation_dataset import SimulatedDataset, MaxStableDataset -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates -from spatio_temporal_dataset.spatial_coordinates.alps_station_2D_coordinates import \ +from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_2D_coordinates import \ AlpsStation2DCoordinatesBetweenZeroAndOne, AlpsStationCoordinatesBetweenZeroAndTwo -from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1, \ +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1, \ CircleCoordinatesRadius2 from extreme_estimator.robustness_plot.display_item import DisplayItem diff --git a/spatio_temporal_dataset/spatial_coordinates/__init__.py b/spatio_temporal_dataset/coordinates/__init__.py similarity index 100% rename from spatio_temporal_dataset/spatial_coordinates/__init__.py rename to spatio_temporal_dataset/coordinates/__init__.py diff --git a/spatio_temporal_dataset/spatial_coordinates/abstract_spatial_coordinates.py b/spatio_temporal_dataset/coordinates/abstract_coordinates.py similarity index 87% rename from spatio_temporal_dataset/spatial_coordinates/abstract_spatial_coordinates.py rename to spatio_temporal_dataset/coordinates/abstract_coordinates.py index 05e55f27f560f1c4ab74df119b59b3445a1c27ce..3b6d31beafa52645f15b67f1a51e85732629019b 100644 --- a/spatio_temporal_dataset/spatial_coordinates/abstract_spatial_coordinates.py +++ b/spatio_temporal_dataset/coordinates/abstract_coordinates.py @@ -24,8 +24,8 @@ class AbstractSpatialCoordinates(object): @classmethod def from_df(cls, df: pd.DataFrame): - # X and Y coordinates must be defined - assert cls.COORDINATE_X in df.columns and cls.COORDINATE_Y in df.columns + # X and coordinates must be defined + assert cls.COORDINATE_X in df.columns df_coordinates = df.loc[:, cls.coordinates_columns(df)] # Potentially, a split column can be specified s_split = df[cls.COORD_SPLIT] if cls.COORD_SPLIT in df.columns else None @@ -33,10 +33,10 @@ class AbstractSpatialCoordinates(object): @classmethod def coordinates_columns(cls, df_coord: pd.DataFrame) -> List[str]: - # If a Z coordinate is in the DataFrame, then - coord_columns = [cls.COORDINATE_X, cls.COORDINATE_Y] - if cls.COORDINATE_Z in df_coord.columns: - coord_columns.append(cls.COORDINATE_Z) + coord_columns = [cls.COORDINATE_X] + for additional_coord in [cls.COORDINATE_Y, cls.COORDINATE_Z]: + if additional_coord in df_coord.columns: + coord_columns.append(additional_coord) return coord_columns @property @@ -101,16 +101,24 @@ class AbstractSpatialCoordinates(object): # Visualization + def visualization_1D(self): + assert len(self.coordinates_columns(self.df_coordinates)) >= 1 + x = self.coordinates[:] + y = np.zeros(len(x)) + plt.scatter(x, y) + plt.show() + def visualization_2D(self): + assert len(self.coordinates_columns(self.df_coordinates)) >= 2 x, y = self.coordinates[:, 0], self.coordinates[:, 1] plt.scatter(x, y) plt.show() def visualization_3D(self): assert len(self.coordinates_columns(self.df_coordinates)) == 3 + x, y, z = self.coordinates[:, 0], self.coordinates[:, 1], self.coordinates[:, 2] fig = plt.figure() ax = fig.add_subplot(111, projection='3d') # type: Axes3D - x, y, z = self.coordinates[:, 0], self.coordinates[:, 1], self.coordinates[:, 2] ax.scatter(x, y, z, marker='^') plt.show() diff --git a/spatio_temporal_dataset/spatial_coordinates/transformations/__init__.py b/spatio_temporal_dataset/coordinates/axis_coordinates/__init__.py similarity index 100% rename from spatio_temporal_dataset/spatial_coordinates/transformations/__init__.py rename to spatio_temporal_dataset/coordinates/axis_coordinates/__init__.py diff --git a/spatio_temporal_dataset/coordinates/axis_coordinates/axis_coordinates.py b/spatio_temporal_dataset/coordinates/axis_coordinates/axis_coordinates.py new file mode 100644 index 0000000000000000000000000000000000000000..21153b1e66ad8c9dad592b8d07cf3be21d4e236c --- /dev/null +++ b/spatio_temporal_dataset/coordinates/axis_coordinates/axis_coordinates.py @@ -0,0 +1,21 @@ +import pandas as pd + +import numpy as np + +from extreme_estimator.extreme_models.utils import get_loaded_r +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates + + +class AxisCoordinates(AbstractSpatialCoordinates): + pass + + +class UniformAxisCoordinates(AxisCoordinates): + + @classmethod + def from_nb_points(cls, nb_points, start=0.0, end=1.0): + # Sample uniformly inside the circle + r = get_loaded_r() + axis_coordinates = np.array(r.runif(nb_points, min=start, max=end)) + df = pd.DataFrame.from_dict({cls.COORDINATE_X: axis_coordinates}) + return cls.from_df(df) diff --git a/spatio_temporal_dataset/coordinates/spatial_coordinates/__init__.py b/spatio_temporal_dataset/coordinates/spatial_coordinates/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py b/spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_2D_coordinates.py similarity index 77% rename from spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py rename to spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_2D_coordinates.py index ae2586ea43de11240ad1acf97cc1c55f56e6af7d..db3d3156d730b3aac0655b58090364b70a660d3b 100644 --- a/spatio_temporal_dataset/spatial_coordinates/alps_station_2D_coordinates.py +++ b/spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_2D_coordinates.py @@ -1,7 +1,7 @@ -from spatio_temporal_dataset.spatial_coordinates.alps_station_3D_coordinates import AlpsStation3DCoordinates -from spatio_temporal_dataset.spatial_coordinates.transformations.transformation_2D import \ +from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_3D_coordinates import AlpsStation3DCoordinates +from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation_2D import \ BetweenZeroAndOne2DNormalization -from spatio_temporal_dataset.spatial_coordinates.transformed_coordinates import TransformedCoordinates +from spatio_temporal_dataset.coordinates.transformed_coordinates.transformed_coordinates import TransformedCoordinates class AlpsStation2DCoordinates(AlpsStation3DCoordinates): diff --git a/spatio_temporal_dataset/spatial_coordinates/alps_station_3D_coordinates.py b/spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_3D_coordinates.py similarity index 86% rename from spatio_temporal_dataset/spatial_coordinates/alps_station_3D_coordinates.py rename to spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_3D_coordinates.py index 67b4b7ffb64fe0c7bd52c2606121d2b28c8aadf8..02a8062ca42a66b69c2a1684ae3a0346d0e961cc 100644 --- a/spatio_temporal_dataset/spatial_coordinates/alps_station_3D_coordinates.py +++ b/spatio_temporal_dataset/coordinates/spatial_coordinates/alps_station_3D_coordinates.py @@ -2,9 +2,9 @@ import os.path as op import pandas as pd -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates -from spatio_temporal_dataset.spatial_coordinates.transformations.tranformation_3D import AnisotropyTransformation -from spatio_temporal_dataset.spatial_coordinates.transformed_coordinates import TransformedCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.transformed_coordinates.tranformation_3D import AnisotropyTransformation +from spatio_temporal_dataset.coordinates.transformed_coordinates.transformed_coordinates import TransformedCoordinates from utils import get_full_path diff --git a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py b/spatio_temporal_dataset/coordinates/spatial_coordinates/generated_coordinates.py similarity index 90% rename from spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py rename to spatio_temporal_dataset/coordinates/spatial_coordinates/generated_coordinates.py index 8f88442761fceda7eecb1f207cf9f19702a90628..883504562f99934783b9e08ece41d7711a48eded 100644 --- a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py +++ b/spatio_temporal_dataset/coordinates/spatial_coordinates/generated_coordinates.py @@ -3,7 +3,7 @@ import numpy as np import pandas as pd from extreme_estimator.extreme_models.utils import get_loaded_r -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates import matplotlib.pyplot as plt diff --git a/spatio_temporal_dataset/coordinates/transformed_coordinates/__init__.py b/spatio_temporal_dataset/coordinates/transformed_coordinates/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/spatio_temporal_dataset/spatial_coordinates/transformations/abstract_transformation.py b/spatio_temporal_dataset/coordinates/transformed_coordinates/abstract_transformation.py similarity index 100% rename from spatio_temporal_dataset/spatial_coordinates/transformations/abstract_transformation.py rename to spatio_temporal_dataset/coordinates/transformed_coordinates/abstract_transformation.py diff --git a/spatio_temporal_dataset/spatial_coordinates/transformations/tranformation_3D.py b/spatio_temporal_dataset/coordinates/transformed_coordinates/tranformation_3D.py similarity index 96% rename from spatio_temporal_dataset/spatial_coordinates/transformations/tranformation_3D.py rename to spatio_temporal_dataset/coordinates/transformed_coordinates/tranformation_3D.py index 42659ee25e1a15da119ea7d441f653f909f37a1b..6754cb1c27803beb6de81e22aecd3b1166fb107d 100644 --- a/spatio_temporal_dataset/spatial_coordinates/transformations/tranformation_3D.py +++ b/spatio_temporal_dataset/coordinates/transformed_coordinates/tranformation_3D.py @@ -1,6 +1,6 @@ import pandas as pd import numpy as np -from spatio_temporal_dataset.spatial_coordinates.transformations.abstract_transformation import AbstractTransformation +from spatio_temporal_dataset.coordinates.transformed_coordinates.abstract_transformation import AbstractTransformation import math diff --git a/spatio_temporal_dataset/spatial_coordinates/transformations/transformation_2D.py b/spatio_temporal_dataset/coordinates/transformed_coordinates/transformation_2D.py similarity index 95% rename from spatio_temporal_dataset/spatial_coordinates/transformations/transformation_2D.py rename to spatio_temporal_dataset/coordinates/transformed_coordinates/transformation_2D.py index 2b55ae532141d710871b0fcb8e01714d54d50d68..3c56441c4f10c6f354e175ba3cde0b0f74ff8a10 100644 --- a/spatio_temporal_dataset/spatial_coordinates/transformations/transformation_2D.py +++ b/spatio_temporal_dataset/coordinates/transformed_coordinates/transformation_2D.py @@ -1,4 +1,4 @@ -from spatio_temporal_dataset.spatial_coordinates.transformations.abstract_transformation import AbstractTransformation +from spatio_temporal_dataset.coordinates.transformed_coordinates.abstract_transformation import AbstractTransformation import pandas as pd diff --git a/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py b/spatio_temporal_dataset/coordinates/transformed_coordinates/transformed_coordinates.py similarity index 76% rename from spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py rename to spatio_temporal_dataset/coordinates/transformed_coordinates/transformed_coordinates.py index c2f99ac74cd10a593a0618f476919b164a26ea13..b1e4c7a6b1441008f70a45f2b065d25a7fbfd21f 100644 --- a/spatio_temporal_dataset/spatial_coordinates/transformed_coordinates.py +++ b/spatio_temporal_dataset/coordinates/transformed_coordinates/transformed_coordinates.py @@ -1,5 +1,5 @@ -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates -from spatio_temporal_dataset.spatial_coordinates.transformations.abstract_transformation import AbstractTransformation +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.transformed_coordinates.abstract_transformation import AbstractTransformation class TransformedCoordinates(AbstractSpatialCoordinates): diff --git a/spatio_temporal_dataset/dataset/abstract_dataset.py b/spatio_temporal_dataset/dataset/abstract_dataset.py index a63ed182d556fd27c8202fe9774d6fa92878a19a..aa46eb827430e65acf6531a1b3ab1baa33856dff 100644 --- a/spatio_temporal_dataset/dataset/abstract_dataset.py +++ b/spatio_temporal_dataset/dataset/abstract_dataset.py @@ -3,13 +3,13 @@ import numpy as np import os.path as op import pandas as pd from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates class AbstractDataset(object): def __init__(self, temporal_observations: AbstractTemporalObservations, spatial_coordinates: AbstractSpatialCoordinates): - # is_same_index = temporal_observations.index == spatial_coordinates.index # type: pd.Series + # is_same_index = temporal_observations.index == coordinates.index # type: pd.Series # assert is_same_index.all() self.temporal_observations = temporal_observations self.spatial_coordinates = spatial_coordinates diff --git a/spatio_temporal_dataset/dataset/simulation_dataset.py b/spatio_temporal_dataset/dataset/simulation_dataset.py index 492bbeca9e5e7f53de61506a9c5866e3b42e6243..e40d77b1ea98e2ed683306397a2d70cead7e7794 100644 --- a/spatio_temporal_dataset/dataset/simulation_dataset.py +++ b/spatio_temporal_dataset/dataset/simulation_dataset.py @@ -1,7 +1,7 @@ from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations from spatio_temporal_dataset.temporal_observations.annual_maxima_observations import \ MaxStableAnnualMaxima, AnnualMaxima, MarginAnnualMaxima, FullAnnualMaxima diff --git a/spatio_temporal_dataset/marginals/spatial_marginals.py b/spatio_temporal_dataset/marginals/spatial_marginals.py index 91b2bcf053a23c68e9c6176b18551e4cd45802c8..6530e0cdfd9ecf89a201c3f1454df54dcead4964 100644 --- a/spatio_temporal_dataset/marginals/spatial_marginals.py +++ b/spatio_temporal_dataset/marginals/spatial_marginals.py @@ -1,6 +1,6 @@ from spatio_temporal_dataset.marginals.abstract_marginals import AbstractMarginals -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates class SpatialMarginal(AbstractMarginals): diff --git a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py index bc461d07b53db2d323cb9329e0429ab4616f777a..5ee31b26b0c26d24daba48bb11aaf8d73c928d6d 100644 --- a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py +++ b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py @@ -2,7 +2,7 @@ import pandas as pd from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel -from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates +from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractSpatialCoordinates from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations diff --git a/test/test_extreme_estimator/test_R_model/test_margin_function.py b/test/test_extreme_estimator/test_R_model/test_margin_function.py index 2981adb2478ef37299c6b70258c76063d6c1f61f..12b099e34bffb71f20ea8ff69eed0572f92d4f1b 100644 --- a/test/test_extreme_estimator/test_R_model/test_margin_function.py +++ b/test/test_extreme_estimator/test_R_model/test_margin_function.py @@ -2,7 +2,7 @@ import unittest from extreme_estimator.gev_params import GevParams from extreme_estimator.extreme_models.margin_model.smooth_margin_model import LinearShapeAxis0MarginModel -from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 class TestLinearMarginModel(unittest.TestCase): diff --git a/test/test_extreme_estimator/test_estimator/test_full_estimators.py b/test/test_extreme_estimator/test_estimator/test_full_estimators.py index 938462e19b31ab450044b5e462dfc17702480593..d112bb6172b68219e9b11b08117e7999ce0b9f2f 100644 --- a/test/test_extreme_estimator/test_estimator/test_full_estimators.py +++ b/test/test_extreme_estimator/test_estimator/test_full_estimators.py @@ -4,7 +4,7 @@ from itertools import product from extreme_estimator.estimator.full_estimator import SmoothMarginalsThenUnitaryMsp, \ FullEstimatorInASingleStepWithSmoothMargin from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset -from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 from test.test_extreme_estimator.test_estimator.test_margin_estimators import TestSmoothMarginEstimator from test.test_extreme_estimator.test_estimator.test_max_stable_estimators import TestMaxStableEstimators diff --git a/test/test_extreme_estimator/test_estimator/test_margin_estimators.py b/test/test_extreme_estimator/test_estimator/test_margin_estimators.py index 8729ef3f0455d7dd74b8debd5d1296245319c0d9..c3a9b54304aaf9bbbf0addbe65b692acd9c9f1b8 100644 --- a/test/test_extreme_estimator/test_estimator/test_margin_estimators.py +++ b/test/test_extreme_estimator/test_estimator/test_margin_estimators.py @@ -1,13 +1,12 @@ import unittest -from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel from extreme_estimator.extreme_models.margin_model.smooth_margin_model import ConstantMarginModel, \ LinearShapeAxis0MarginModel, LinearShapeAxis0and1MarginModel, LinearAllParametersAxis0MarginModel, \ LinearAllParametersAxis0And1MarginModel from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator from extreme_estimator.return_level_plot.spatial_2D_plot import Spatial2DPlot from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset -from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 class TestSmoothMarginEstimator(unittest.TestCase): diff --git a/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py b/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py index a523f027ad6cacb8ba5298ac92737afa1607aa52..050256d6fa9fa4556125ac1cb9563be9b6e1eedf 100644 --- a/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py +++ b/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py @@ -6,7 +6,7 @@ from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Geometric, ExtremalT, ISchlather from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset -from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 class TestMaxStableEstimators(unittest.TestCase): diff --git a/test/test_spatio_temporal_dataset/test_coordinates.py b/test/test_spatio_temporal_dataset/test_coordinates.py new file mode 100644 index 0000000000000000000000000000000000000000..b4890ee21ced949f01c68b18ea6aabfa5bb6b7af --- /dev/null +++ b/test/test_spatio_temporal_dataset/test_coordinates.py @@ -0,0 +1,44 @@ +import unittest + +from spatio_temporal_dataset.coordinates.axis_coordinates.axis_coordinates import UniformAxisCoordinates +from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_2D_coordinates import \ + AlpsStation2DCoordinatesBetweenZeroAndOne +from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_3D_coordinates import \ + AlpsStation3DCoordinatesWithAnisotropy +from spatio_temporal_dataset.coordinates.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1 + + +class TestSpatialCoordinates(unittest.TestCase): + DISPLAY = False + + def test_circle(self): + coord = CircleCoordinatesRadius1.from_nb_points(nb_points=500) + if self.DISPLAY: + coord.visualization_2D() + self.assertTrue(True) + + def test_anisotropy(self): + coord = AlpsStation3DCoordinatesWithAnisotropy.from_csv() + if self.DISPLAY: + coord.visualization_3D() + self.assertTrue(True) + + def test_normalization(self): + coord = AlpsStation2DCoordinatesBetweenZeroAndOne.from_csv() + if self.DISPLAY: + coord.visualization_2D() + self.assertTrue(True) + + +class TestAxisCoordinates(unittest.TestCase): + DISPLAY = False + + def test_unif(self): + coord = UniformAxisCoordinates.from_nb_points(nb_points=10) + if self.DISPLAY: + coord.visualization_1D() + self.assertTrue(True) + + +if __name__ == '__main__': + unittest.main() diff --git a/test/test_spatio_temporal_dataset/test_spatial_coordinates.py b/test/test_spatio_temporal_dataset/test_spatial_coordinates.py deleted file mode 100644 index cf657c2143ba843377edb0298a283e8e7a290fc8..0000000000000000000000000000000000000000 --- a/test/test_spatio_temporal_dataset/test_spatial_coordinates.py +++ /dev/null @@ -1,34 +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 TestSpatialCoordinates(unittest.TestCase): - - DISPLAY = False - - def test_circle(self): - coord_2D = CircleCoordinatesRadius1.from_nb_points(nb_points=500) - if self.DISPLAY: - coord_2D.visualization_2D() - self.assertTrue(True) - - def test_anisotropy(self): - coord_3D = AlpsStation3DCoordinatesWithAnisotropy.from_csv() - if self.DISPLAY: - coord_3D.visualization_3D() - self.assertTrue(True) - - def test_normalization(self): - coord_2D = AlpsStation2DCoordinatesBetweenZeroAndOne.from_csv() - if self.DISPLAY: - coord_2D.visualization_2D() - self.assertTrue(True) - - -if __name__ == '__main__': - unittest.main()