From 05a80ecc9a54ed40130356664c7c747d75071cc0 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Wed, 14 Nov 2018 18:39:19 +0100
Subject: [PATCH] refactoring and renaming
---
extreme_estimator/estimator/full_estimator.py | 4 ++--
extreme_estimator/estimator/margin_estimator.py | 2 +-
.../estimator/max_stable_estimator.py | 2 +-
.../{R_model => extreme_models}/__init__.py | 0
.../abstract_model.py | 2 +-
.../margin_model}/__init__.py | 0
.../margin_model/abstract_margin_model.py | 6 +++---
.../margin_model}/margin_function/__init__.py | 0
.../margin_function/abstract_margin_function.py | 4 +---
.../independent_margin_function.py | 6 +++---
.../margin_function/plot_margin_functions.py | 0
.../margin_model/smooth_margin_model.py | 8 ++++----
.../max_stable_model}/__init__.py | 0
.../abstract_max_stable_model.py | 2 +-
.../max_stable_model/max_stable_fit.R | 0
.../max_stable_model/max_stable_models.py | 2 +-
.../max_stable_model/test.R | 0
.../{R_model => extreme_models}/utils.py | 0
.../max_stable_model => gev}/__init__.py | 0
.../{R_model => }/gev/gev_mle_fit.R | 0
.../{R_model => }/gev/gev_mle_fit.py | 4 ++--
.../gev/gev_parameters.py => gev_params.py} | 0
.../robustness_plot/msp_robustness.py | 16 +++++++++-------
.../dataset/simulation_dataset.py | 4 ++--
.../spatial_coordinates/generated_coordinates.py | 2 +-
.../annual_maxima_observations.py | 4 ++--
.../test_R_model/test_gev_mle_fit.py | 4 ++--
.../test_R_model/test_margin_function.py | 7 +++----
.../test_estimator/test_margin_estimators.py | 4 ++--
.../test_estimator/test_max_stable_estimators.py | 4 ++--
30 files changed, 43 insertions(+), 44 deletions(-)
rename extreme_estimator/{R_model => extreme_models}/__init__.py (100%)
rename extreme_estimator/{R_model => extreme_models}/abstract_model.py (94%)
rename extreme_estimator/{R_model/gev => extreme_models/margin_model}/__init__.py (100%)
rename extreme_estimator/{R_model => extreme_models}/margin_model/abstract_margin_model.py (92%)
rename extreme_estimator/{R_model => extreme_models/margin_model}/margin_function/__init__.py (100%)
rename extreme_estimator/{R_model => extreme_models/margin_model}/margin_function/abstract_margin_function.py (93%)
rename extreme_estimator/{R_model => extreme_models/margin_model}/margin_function/independent_margin_function.py (94%)
rename extreme_estimator/{R_model => extreme_models/margin_model}/margin_function/plot_margin_functions.py (100%)
rename extreme_estimator/{R_model => extreme_models}/margin_model/smooth_margin_model.py (81%)
rename extreme_estimator/{R_model/margin_model => extreme_models/max_stable_model}/__init__.py (100%)
rename extreme_estimator/{R_model => extreme_models}/max_stable_model/abstract_max_stable_model.py (97%)
rename extreme_estimator/{R_model => extreme_models}/max_stable_model/max_stable_fit.R (100%)
rename extreme_estimator/{R_model => extreme_models}/max_stable_model/max_stable_models.py (96%)
rename extreme_estimator/{R_model => extreme_models}/max_stable_model/test.R (100%)
rename extreme_estimator/{R_model => extreme_models}/utils.py (100%)
rename extreme_estimator/{R_model/max_stable_model => gev}/__init__.py (100%)
rename extreme_estimator/{R_model => }/gev/gev_mle_fit.R (100%)
rename extreme_estimator/{R_model => }/gev/gev_mle_fit.py (88%)
rename extreme_estimator/{R_model/gev/gev_parameters.py => gev_params.py} (100%)
diff --git a/extreme_estimator/estimator/full_estimator.py b/extreme_estimator/estimator/full_estimator.py
index f674fb3f..d6df3dd7 100644
--- a/extreme_estimator/estimator/full_estimator.py
+++ b/extreme_estimator/estimator/full_estimator.py
@@ -1,5 +1,5 @@
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+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 extreme_estimator.estimator.abstract_estimator import AbstractEstimator
from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator
from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
diff --git a/extreme_estimator/estimator/margin_estimator.py b/extreme_estimator/estimator/margin_estimator.py
index fd9c3e95..30bb6836 100644
--- a/extreme_estimator/estimator/margin_estimator.py
+++ b/extreme_estimator/estimator/margin_estimator.py
@@ -1,4 +1,4 @@
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
diff --git a/extreme_estimator/estimator/max_stable_estimator.py b/extreme_estimator/estimator/max_stable_estimator.py
index 6d40cc26..b663ac67 100644
--- a/extreme_estimator/estimator/max_stable_estimator.py
+++ b/extreme_estimator/estimator/max_stable_estimator.py
@@ -1,5 +1,5 @@
from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
import numpy as np
diff --git a/extreme_estimator/R_model/__init__.py b/extreme_estimator/extreme_models/__init__.py
similarity index 100%
rename from extreme_estimator/R_model/__init__.py
rename to extreme_estimator/extreme_models/__init__.py
diff --git a/extreme_estimator/R_model/abstract_model.py b/extreme_estimator/extreme_models/abstract_model.py
similarity index 94%
rename from extreme_estimator/R_model/abstract_model.py
rename to extreme_estimator/extreme_models/abstract_model.py
index ea8b2f20..36533941 100644
--- a/extreme_estimator/R_model/abstract_model.py
+++ b/extreme_estimator/extreme_models/abstract_model.py
@@ -1,4 +1,4 @@
-from extreme_estimator.R_model.utils import get_loaded_r
+from extreme_estimator.extreme_models.utils import get_loaded_r
class AbstractModel(object):
diff --git a/extreme_estimator/R_model/gev/__init__.py b/extreme_estimator/extreme_models/margin_model/__init__.py
similarity index 100%
rename from extreme_estimator/R_model/gev/__init__.py
rename to extreme_estimator/extreme_models/margin_model/__init__.py
diff --git a/extreme_estimator/R_model/margin_model/abstract_margin_model.py b/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py
similarity index 92%
rename from extreme_estimator/R_model/margin_model/abstract_margin_model.py
rename to extreme_estimator/extreme_models/margin_model/abstract_margin_model.py
index 384179f1..fea9bfcc 100644
--- a/extreme_estimator/R_model/margin_model/abstract_margin_model.py
+++ b/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py
@@ -1,8 +1,8 @@
import numpy as np
-from extreme_estimator.R_model.abstract_model import AbstractModel
-from extreme_estimator.R_model.margin_function.abstract_margin_function import AbstractMarginFunction
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
+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
diff --git a/extreme_estimator/R_model/margin_function/__init__.py b/extreme_estimator/extreme_models/margin_model/margin_function/__init__.py
similarity index 100%
rename from extreme_estimator/R_model/margin_function/__init__.py
rename to extreme_estimator/extreme_models/margin_model/margin_function/__init__.py
diff --git a/extreme_estimator/R_model/margin_function/abstract_margin_function.py b/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py
similarity index 93%
rename from extreme_estimator/R_model/margin_function/abstract_margin_function.py
rename to extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py
index 5392b287..6db45309 100644
--- a/extreme_estimator/R_model/margin_function/abstract_margin_function.py
+++ b/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py
@@ -1,10 +1,8 @@
-from typing import List, Dict
-
import matplotlib.cm as cm
import matplotlib.pyplot as plt
import numpy as np
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
+from extreme_estimator.gev_params import GevParams
from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
diff --git a/extreme_estimator/R_model/margin_function/independent_margin_function.py b/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py
similarity index 94%
rename from extreme_estimator/R_model/margin_function/independent_margin_function.py
rename to extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py
index ce255e4b..18fbd21e 100644
--- a/extreme_estimator/R_model/margin_function/independent_margin_function.py
+++ b/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py
@@ -1,9 +1,9 @@
-from typing import Dict, List
+from typing import Dict
import numpy as np
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
-from extreme_estimator.R_model.margin_function.abstract_margin_function import AbstractMarginFunction
+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
diff --git a/extreme_estimator/R_model/margin_function/plot_margin_functions.py b/extreme_estimator/extreme_models/margin_model/margin_function/plot_margin_functions.py
similarity index 100%
rename from extreme_estimator/R_model/margin_function/plot_margin_functions.py
rename to extreme_estimator/extreme_models/margin_model/margin_function/plot_margin_functions.py
diff --git a/extreme_estimator/R_model/margin_model/smooth_margin_model.py b/extreme_estimator/extreme_models/margin_model/smooth_margin_model.py
similarity index 81%
rename from extreme_estimator/R_model/margin_model/smooth_margin_model.py
rename to extreme_estimator/extreme_models/margin_model/smooth_margin_model.py
index bf29a650..8d9febab 100644
--- a/extreme_estimator/R_model/margin_model/smooth_margin_model.py
+++ b/extreme_estimator/extreme_models/margin_model/smooth_margin_model.py
@@ -1,9 +1,9 @@
import numpy as np
-from extreme_estimator.R_model.margin_function.abstract_margin_function import AbstractMarginFunction
-from extreme_estimator.R_model.margin_function.independent_margin_function import LinearMarginFunction
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
+from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import AbstractMarginFunction
+from extreme_estimator.extreme_models.margin_model.margin_function.independent_margin_function import LinearMarginFunction
+from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.gev_params import GevParams
class LinearMarginModel(AbstractMarginModel):
diff --git a/extreme_estimator/R_model/margin_model/__init__.py b/extreme_estimator/extreme_models/max_stable_model/__init__.py
similarity index 100%
rename from extreme_estimator/R_model/margin_model/__init__.py
rename to extreme_estimator/extreme_models/max_stable_model/__init__.py
diff --git a/extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py b/extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py
similarity index 97%
rename from extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py
rename to extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py
index 1075d383..8c5a5f31 100644
--- a/extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py
+++ b/extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py
@@ -4,7 +4,7 @@ import numpy as np
import rpy2
from rpy2.robjects import ListVector
-from extreme_estimator.R_model.abstract_model import AbstractModel
+from extreme_estimator.extreme_models.abstract_model import AbstractModel
class AbstractMaxStableModel(AbstractModel):
diff --git a/extreme_estimator/R_model/max_stable_model/max_stable_fit.R b/extreme_estimator/extreme_models/max_stable_model/max_stable_fit.R
similarity index 100%
rename from extreme_estimator/R_model/max_stable_model/max_stable_fit.R
rename to extreme_estimator/extreme_models/max_stable_model/max_stable_fit.R
diff --git a/extreme_estimator/R_model/max_stable_model/max_stable_models.py b/extreme_estimator/extreme_models/max_stable_model/max_stable_models.py
similarity index 96%
rename from extreme_estimator/R_model/max_stable_model/max_stable_models.py
rename to extreme_estimator/extreme_models/max_stable_model/max_stable_models.py
index f339db9e..1835c6a5 100644
--- a/extreme_estimator/R_model/max_stable_model/max_stable_models.py
+++ b/extreme_estimator/extreme_models/max_stable_model/max_stable_models.py
@@ -1,6 +1,6 @@
from enum import Enum
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
+from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
diff --git a/extreme_estimator/R_model/max_stable_model/test.R b/extreme_estimator/extreme_models/max_stable_model/test.R
similarity index 100%
rename from extreme_estimator/R_model/max_stable_model/test.R
rename to extreme_estimator/extreme_models/max_stable_model/test.R
diff --git a/extreme_estimator/R_model/utils.py b/extreme_estimator/extreme_models/utils.py
similarity index 100%
rename from extreme_estimator/R_model/utils.py
rename to extreme_estimator/extreme_models/utils.py
diff --git a/extreme_estimator/R_model/max_stable_model/__init__.py b/extreme_estimator/gev/__init__.py
similarity index 100%
rename from extreme_estimator/R_model/max_stable_model/__init__.py
rename to extreme_estimator/gev/__init__.py
diff --git a/extreme_estimator/R_model/gev/gev_mle_fit.R b/extreme_estimator/gev/gev_mle_fit.R
similarity index 100%
rename from extreme_estimator/R_model/gev/gev_mle_fit.R
rename to extreme_estimator/gev/gev_mle_fit.R
diff --git a/extreme_estimator/R_model/gev/gev_mle_fit.py b/extreme_estimator/gev/gev_mle_fit.py
similarity index 88%
rename from extreme_estimator/R_model/gev/gev_mle_fit.py
rename to extreme_estimator/gev/gev_mle_fit.py
index f879f2bf..0a19e0cf 100644
--- a/extreme_estimator/R_model/gev/gev_mle_fit.py
+++ b/extreme_estimator/gev/gev_mle_fit.py
@@ -4,8 +4,8 @@ import rpy2.robjects.numpy2ri as rpyn
import os.path as op
# Defining some constants
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
-from extreme_estimator.R_model.utils import get_associated_r_file
+from extreme_estimator.gev_params import GevParams
+from extreme_estimator.extreme_models.utils import get_associated_r_file
def gev_mle_fit(x_gev: np.ndarray, start_loc=0, start_scale=1, start_shape=0):
diff --git a/extreme_estimator/R_model/gev/gev_parameters.py b/extreme_estimator/gev_params.py
similarity index 100%
rename from extreme_estimator/R_model/gev/gev_parameters.py
rename to extreme_estimator/gev_params.py
diff --git a/extreme_estimator/robustness_plot/msp_robustness.py b/extreme_estimator/robustness_plot/msp_robustness.py
index 6124a4e3..fa902d3d 100644
--- a/extreme_estimator/robustness_plot/msp_robustness.py
+++ b/extreme_estimator/robustness_plot/msp_robustness.py
@@ -1,10 +1,12 @@
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, CovarianceFunction
-from extreme_estimator.R_model.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, \
+ CovarianceFunction
+from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
+ ExtremalT
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
+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 \
AlpsStation2DCoordinatesBetweenZeroAndOne, AlpsStationCoordinatesBetweenZeroAndTwo
@@ -39,9 +41,9 @@ class MspSpatial(object):
nb_station = self.NbStationItem.value_from_kwargs(**kwargs_single_point)
nb_obs = self.NbObservationItem.value_from_kwargs(**kwargs_single_point)
# Run the estimation
- spatial_coordinate = spatial_coordinate_class.from_nb_points(nb_points=nb_station)
- dataset = SimulatedDataset.from_max_stable_sampling(nb_obs=nb_obs, max_stable_model=max_stable_model,
- spatial_coordinates=spatial_coordinate)
+ spatial_coordinates = spatial_coordinate_class.from_nb_points(nb_points=nb_station)
+ dataset = MaxStableDataset.from_sampling(nb_obs=nb_obs, max_stable_model=max_stable_model,
+ spatial_coordinates=spatial_coordinates)
estimator = MaxStableEstimator(dataset, max_stable_model)
estimator.fit()
return estimator.scalars(max_stable_model.params_sample)
@@ -88,7 +90,7 @@ def multiple_spatial_robustness_alps():
nb_samples=nb_sample,
main_title="Max stable analysis with {} years of observations".format(nb_observation),
plot_png_filename=plot_name
- )
+ )
# Load all the models
msp_models = [Smith(), BrownResnick()]
# for covariance_function in CovarianceFunction:
diff --git a/spatio_temporal_dataset/dataset/simulation_dataset.py b/spatio_temporal_dataset/dataset/simulation_dataset.py
index bcf21316..492bbeca 100644
--- a/spatio_temporal_dataset/dataset/simulation_dataset.py
+++ b/spatio_temporal_dataset/dataset/simulation_dataset.py
@@ -1,5 +1,5 @@
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+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.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations
diff --git a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py b/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
index c9ae9953..52f53595 100644
--- a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
+++ b/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
@@ -2,7 +2,7 @@ import math
import numpy as np
import pandas as pd
-from extreme_estimator.R_model.utils import get_loaded_r
+from extreme_estimator.extreme_models.utils import get_loaded_r
from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
import matplotlib.pyplot as plt
diff --git a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
index a24f6cdf..bc461d07 100644
--- a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
+++ b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
@@ -1,7 +1,7 @@
import pandas as pd
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+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.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations
diff --git a/test/test_extreme_estimator/test_R_model/test_gev_mle_fit.py b/test/test_extreme_estimator/test_R_model/test_gev_mle_fit.py
index 60da9acc..c7c7f8cf 100644
--- a/test/test_extreme_estimator/test_R_model/test_gev_mle_fit.py
+++ b/test/test_extreme_estimator/test_R_model/test_gev_mle_fit.py
@@ -2,8 +2,8 @@ import unittest
import numpy as np
-from extreme_estimator.R_model.gev.gev_mle_fit import GevMleFit
-from extreme_estimator.R_model.utils import get_loaded_r
+from extreme_estimator.gev.gev_mle_fit import GevMleFit
+from extreme_estimator.extreme_models.utils import get_loaded_r
class TestGevMleFit(unittest.TestCase):
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 f9a75c26..2981adb2 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
@@ -1,13 +1,12 @@
import unittest
-from extreme_estimator.R_model.gev.gev_parameters import GevParams
-from extreme_estimator.R_model.margin_function.independent_margin_function import LinearMarginFunction
-from extreme_estimator.R_model.margin_model.smooth_margin_model import ConstantMarginModel, LinearShapeAxis0MarginModel
+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
class TestLinearMarginModel(unittest.TestCase):
- DISPLAY = True
+ DISPLAY = False
def test_visualization_2D(self):
spatial_coordinates = CircleCoordinatesRadius1.from_nb_points(nb_points=50)
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 322fd309..480ebba2 100644
--- a/test/test_extreme_estimator/test_estimator/test_margin_estimators.py
+++ b/test/test_extreme_estimator/test_estimator/test_margin_estimators.py
@@ -1,7 +1,7 @@
import unittest
-from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_model.margin_model.smooth_margin_model import ConstantMarginModel
+from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.extreme_models.margin_model.smooth_margin_model import ConstantMarginModel
from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator
from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset
from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1
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 c00ef17d..a523f027 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
@@ -1,8 +1,8 @@
import unittest
-from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import \
+from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import \
AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
-from extreme_estimator.R_model.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
+from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
Geometric, ExtremalT, ISchlather
from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
--
GitLab