[refactoring] move margin function, and param function

extreme_fit/model/margin_model/param_function/linear_coef.py → extreme_fit/function/param_function/linear_coef.py

 from typing import Dict, List
 
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 

extreme_fit/model/margin_model/param_function/param_function.py → extreme_fit/function/param_function/param_function.py

 from typing import List
 import numpy as np
-from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
-from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef
+from extreme_fit.function.param_function.linear_coef import LinearCoef
+from extreme_fit.function.param_function.spline_coef import SplineCoef
 
 
 class AbstractParamFunction(object):

extreme_fit/model/margin_model/param_function/spline_coef.py → extreme_fit/function/param_function/spline_coef.py

 from typing import Dict
 
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
 
 
 class PolynomialCoef(AbstractCoef):

extreme_fit/model/margin_model/abstract_margin_model.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 
 from extreme_fit.model.abstract_model import AbstractModel
-from extreme_fit.model.margin_model.margin_function.abstract_margin_function \
+from extreme_fit.function.margin_function.abstract_margin_function \
     import AbstractMarginFunction
 from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
 from extreme_fit.model.utils import r

extreme_fit/model/margin_model/linear_margin_model/linear_margin_model.py

-from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.param_function.linear_coef import LinearCoef
 from extreme_fit.model.margin_model.parametric_margin_model import ParametricMarginModel
 from extreme_fit.distribution.gev.gev_params import GevParams
-from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
 class LinearMarginModel(ParametricMarginModel):

extreme_fit/model/margin_model/parametric_margin_model.py

@@ -3,7 +3,7 @@ from abc import ABC
 import numpy as np
 import pandas as pd
 
-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.result_from_model_fit.result_from_spatial_extreme import ResultFromSpatialExtreme
 from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel

extreme_fit/model/margin_model/spline_margin_model.py

 from typing import Dict, List
 
-from extreme_fit.model.margin_model.margin_function.spline_margin_function import SplineMarginFunction
-from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef, KnotCoef, \
+from extreme_fit.function.margin_function.spline_margin_function import SplineMarginFunction
+from extreme_fit.function.param_function.abstract_coef import AbstractCoef
+from extreme_fit.function.param_function.spline_coef import SplineCoef, KnotCoef, \
     PolynomialCoef
 from extreme_fit.model.margin_model.parametric_margin_model import ParametricMarginModel
 from extreme_fit.distribution.gev.gev_params import GevParams

extreme_fit/model/result_from_model_fit/result_from_extremes/abstract_extract_eurocode_return_level.py

@@ -3,11 +3,11 @@ from typing import List
 import numpy as np
 from cached_property import cached_property
 
-from experiment.eurocode_data.utils import EUROCODE_QUANTILE, YEAR_OF_INTEREST_FOR_RETURN_LEVEL
+from experiment.eurocode_data.utils import EUROCODE_QUANTILE
 from extreme_fit.distribution.gev.gev_params import GevParams
 from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
 from extreme_fit.estimator.utils import load_margin_function
-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.result_from_extremes.result_from_bayesian_extremes import \
     ResultFromBayesianExtremes
 from extreme_fit.model.result_from_model_fit.result_from_extremes.result_from_mle_extremes import ResultFromMleExtremes

extreme_fit/model/result_from_model_fit/result_from_spatial_extreme.py

@@ -2,7 +2,7 @@ from typing import Dict
 
 import numpy as np
 
-from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.function.param_function.linear_coef import LinearCoef
 from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import \
     AbstractResultFromModelFit
 

extreme_fit/model/result_from_model_fit/utils.py

@@ -3,7 +3,7 @@ from collections import OrderedDict
 import numpy as np
 
 from extreme_fit.distribution.gev.gev_params import GevParams
-from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.function.param_function.linear_coef import LinearCoef
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 

test/test_extreme_fit/test_model/test_margin_function.py

@@ -3,9 +3,9 @@ import unittest
 import numpy as np
 
 from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
-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.linear_margin_function import LinearMarginFunction
+from extreme_fit.function.margin_function.linear_margin_function import LinearMarginFunction
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_2D import LinSpaceSpatial2DCoordinates
 from test.test_utils import load_test_spatiotemporal_coordinates