[refactoring] move margin function, and param function

experiment/meteo_france_data/scm_models_data/abstract_study.py

 import datetime
 
 from matplotlib.lines import Line2D
-from matplotlib.markers import MarkerStyle
-from matplotlib.patches import Polygon, Patch
 import io
 import os
 import os.path as op
@@ -25,7 +23,7 @@ from experiment.meteo_france_data.scm_models_data.scm_constants import ALTITUDES
     LATITUDES, ORIENTATIONS, SLOPES, ORDERED_ALLSLOPES_ALTITUDES, ORDERED_ALLSLOPES_ORIENTATIONS, \
     ORDERED_ALLSLOPES_SLOPES, ORDERED_ALLSLOPES_MASSIFNUM
 from experiment.meteo_france_data.scm_models_data.visualization.utils import get_km_formatter
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from experiment.meteo_france_data.plot.create_shifted_cmap import create_colorbase_axis, \
     get_shifted_map, get_colors

experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py

@@ -29,9 +29,9 @@ from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import Lin
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import \
     LinearNonStationaryLocationMarginModel, \
     LinearStationaryMarginModel
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction
+from extreme_fit.function.param_function.param_function import AbstractParamFunction
 from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
 from extreme_fit.distribution.gev.gev_params import GevParams
 from extreme_fit.distribution.gev.ismev_gev_fit import IsmevGevFit

experiment/regression_margin/regression_margin.py

 import numpy as np
 
 from extreme_fit.estimator.full_estimator.abstract_full_estimator import FullEstimatorInASingleStepWithSmoothMargin
-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
     ConstantMarginModel
 from extreme_fit.model.max_stable_model.max_stable_models import Smith

experiment/simulation/abstract_simulation.py

@@ -14,11 +14,11 @@ import seaborn as sns
 from numpy.linalg import LinAlgError
 
 from extreme_fit.estimator.abstract_estimator import AbstractEstimator
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_fit.model.margin_model.margin_function.combined_margin_function import \
+from extreme_fit.function.margin_function.combined_margin_function import \
     CombinedMarginFunction
-from extreme_fit.model.margin_model.margin_function.utils import error_dict_between_margin_functions
+from extreme_fit.function.margin_function.utils import error_dict_between_margin_functions
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.dataset.abstract_dataset import get_subset_dataset
 from spatio_temporal_dataset.dataset.simulation_dataset import SimulatedDataset

experiment/trend_analysis/non_stationary_trends.py

@@ -14,7 +14,7 @@ from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model impo
     LinearStationaryMarginModel, LinearNonStationaryLocationMarginModel
 from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     StationaryTemporalModel, NonStationaryLocationTemporalModel
-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 from extreme_fit.model.utils import OptimizationConstants
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 from root_utils import get_display_name_from_object_type

extreme_fit/estimator/abstract_estimator.py

@@ -3,7 +3,7 @@ from typing import Union
 from cached_property import cached_property
 
 from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 

extreme_fit/estimator/full_estimator/abstract_full_estimator.py

@@ -5,7 +5,7 @@ from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import Lin
 from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
 from extreme_fit.estimator.utils import load_margin_function
 from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
 from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset

extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py

@@ -5,7 +5,7 @@ from cached_property import cached_property
 from extreme_fit.estimator.abstract_estimator import AbstractEstimator
 from extreme_fit.estimator.utils import load_margin_function, compute_nllh
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 from spatio_temporal_dataset.slicer.split import Split

extreme_fit/estimator/quantile_estimator/abstract_quantile_function.py

 import numpy as np
 
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import AbstractMarginFunction
+from extreme_fit.function.margin_function.abstract_margin_function import AbstractMarginFunction
 
 
 class AbstractQuantileFunction(object):

extreme_fit/estimator/utils.py

@@ -2,7 +2,7 @@ import numpy as np
 
 from extreme_fit.estimator.abstract_estimator import AbstractEstimator
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 
 
 def load_margin_function(estimator: AbstractEstimator, margin_model: LinearMarginModel,

extreme_fit/function/abstract_function.py

+
+
+class AbstractFunction(object):
+    pass
\ No newline at end of file

extreme_fit/model/margin_model/margin_function/combined_margin_function.py → extreme_fit/function/margin_function/combined_margin_function.py

@@ -3,7 +3,7 @@ from itertools import combinations
 
 import numpy as np
 
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates

extreme_fit/model/margin_model/margin_function/independent_margin_function.py → extreme_fit/function/margin_function/independent_margin_function.py

@@ -2,9 +2,9 @@ from typing import Dict, Union
 
 import numpy as np
 
-from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction
+from extreme_fit.function.param_function.param_function import AbstractParamFunction
 from extreme_fit.distribution.gev.gev_params import GevParams
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 

extreme_fit/model/margin_model/margin_function/linear_margin_function.py → extreme_fit/function/margin_function/linear_margin_function.py

 from typing import Dict, List, Union
 
 from extreme_fit.distribution.abstract_params import AbstractParams
-from extreme_fit.model.margin_model.margin_function.parametric_margin_function import \
+from extreme_fit.function.margin_function.parametric_margin_function import \
     ParametricMarginFunction
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
-from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.linear_coef import LinearCoef
+from extreme_fit.function.param_function.param_function import AbstractParamFunction, \
     LinearParamFunction
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates

extreme_fit/model/margin_model/margin_function/parametric_margin_function.py → extreme_fit/function/margin_function/parametric_margin_function.py

@@ -2,10 +2,10 @@ from typing import Dict, List, Union
 
 import numpy as np
 
-from extreme_fit.model.margin_model.margin_function.independent_margin_function import \
+from extreme_fit.function.margin_function.independent_margin_function import \
     IndependentMarginFunction
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.param_function import AbstractParamFunction, \
     ConstantParamFunction
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates

extreme_fit/model/margin_model/margin_function/spline_margin_function.py → extreme_fit/function/margin_function/spline_margin_function.py

@@ -2,12 +2,12 @@ from typing import Dict, List
 
 import numpy as np
 
-from extreme_fit.model.margin_model.margin_function.parametric_margin_function import \
+from extreme_fit.function.margin_function.parametric_margin_function import \
     ParametricMarginFunction
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.param_function import AbstractParamFunction, \
     SplineParamFunction
-from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef
+from extreme_fit.function.param_function.spline_coef import SplineCoef
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 

extreme_fit/model/margin_model/margin_function/utils.py → extreme_fit/function/margin_function/utils.py

-from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.function.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from extreme_fit.distribution.gev.gev_params import GevParams