[R Model] refactor directory names.

extreme_estimator/R_fit/abstract_model.py → extreme_estimator/R_model/abstract_model.py

-from extreme_estimator.R_fit.utils import get_loaded_r
+from extreme_estimator.R_model.utils import get_loaded_r
 
 
 class AbstractModel(object):

extreme_estimator/R_fit/gev_fit/abstract_margin_model.py → extreme_estimator/R_model/margin_model/abstract_margin_model.py

 import numpy as np
 import pandas as pd
 
-from extreme_estimator.R_fit.abstract_model import AbstractModel
-from extreme_estimator.R_fit.gev_fit.gev_mle_fit import GevMleFit, mle_gev
+from extreme_estimator.R_model.abstract_model import AbstractModel
+from extreme_estimator.R_model.margin_model.gev_mle_fit import GevMleFit, mle_gev
 
 
 class AbstractMarginModel(AbstractModel):

extreme_estimator/R_fit/gev_fit/gev_mle_fit.py → extreme_estimator/R_model/margin_model/gev_mle_fit.py

@@ -4,7 +4,7 @@ import rpy2.robjects.numpy2ri as rpyn
 import os.path as op
 
 # Defining some constants
-from extreme_estimator.R_fit.utils import get_associated_r_file
+from extreme_estimator.R_model.utils import get_associated_r_file
 
 
 def mle_gev(x_gev: np.ndarray, start_loc=0, start_scale=1, start_shape=0):

extreme_estimator/R_fit/max_stable_fit/abstract_max_stable_model.py → extreme_estimator/R_model/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_fit.abstract_model import AbstractModel
+from extreme_estimator.R_model.abstract_model import AbstractModel
 
 
 class AbstractMaxStableModel(AbstractModel):

extreme_estimator/R_fit/max_stable_fit/max_stable_models.py → extreme_estimator/R_model/max_stable_model/max_stable_models.py

 from enum import Enum
 
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel, \
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
     AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
 
 

extreme_estimator/estimator/full_estimator.py

-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+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.estimator.abstract_estimator import AbstractEstimator
 from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator
 from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator

extreme_estimator/estimator/margin_estimator.py

-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 

extreme_estimator/estimator/max_stable_estimator.py

 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 import numpy as np
 

extreme_estimator/robustness_plot/msp_robustness.py

-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel, CovarianceFunction
-from extreme_estimator.R_fit.max_stable_fit.max_stable_models import Smith, BrownResnick, Schlather, ExtremalT
+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.estimator.abstract_estimator import AbstractEstimator
 from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
 from extreme_estimator.robustness_plot.multiple_plot import MultiplePlot

spatio_temporal_dataset/dataset/simulation_dataset.py

-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+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 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

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_fit.utils import get_loaded_r
+from extreme_estimator.R_model.utils import get_loaded_r
 from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
 import matplotlib.pyplot as plt
 

spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py

 import pandas as pd
 
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+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 spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
 from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations
 

test/test_extreme_estimator/test_margin_estimators.py

@@ -2,9 +2,9 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import ConstantMarginModel
-from extreme_estimator.R_fit.gev_fit.gev_mle_fit import GevMleFit
-from extreme_estimator.R_fit.utils import get_loaded_r
+from extreme_estimator.R_model.margin_model.abstract_margin_model import ConstantMarginModel
+from extreme_estimator.R_model.margin_model.gev_mle_fit import GevMleFit
+from extreme_estimator.R_model.utils import get_loaded_r
 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