diff --git a/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py index a68f6588ecb255baae3d5fae26e678c65e5160ab..3b36549dade08bede628656df594b900a44ad31a 100644 --- a/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py +++ b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py @@ -1,4 +1,5 @@ from abc import ABC +import numpy.testing as npt import numpy as np from cached_property import cached_property @@ -67,7 +68,9 @@ class LinearMarginEstimator(AbstractMarginEstimator): return nllh def aic(self, split=Split.all): - return 2 * self.margin_model.nb_params + 2 * self.nllh(split=split) + aic = 2 * self.margin_model.nb_params + 2 * self.nllh(split=split) + npt.assert_almost_equal(self.result_from_model_fit.aic, aic, decimal=5) + return aic def bic(self, split=Split.all): n = len(self.dataset.maxima_gev(split=split)) diff --git a/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py index b2f2d47ee234ec20539950ed8b0d6192a81f0807..810c90bfd4cfe691ce3fe364f0c8ddee5bce0c94 100644 --- a/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py +++ b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py @@ -23,14 +23,14 @@ def plot_time_series(studies, massif_names=None): def plot_moments(studies, massif_names=None): - for std in [True, False][1:]: + for std in [True, False][:]: for change in [True, False, None]: studies.plot_mean_maxima_against_altitude(massif_names=massif_names, std=std, change=change) def main(): - altitudes = [900, 1200, 1500, 1800, 2100, 2400, 2700, 3000] - # altitudes = [900, 1200, 1500, 1800, 2100, 2400, 2700, 3000, 3300, 3600, 3900] + # altitudes = [900, 1200, 1500, 1800, 2100, 2400, 2700, 3000] + altitudes = [900, 1200, 1500, 1800, 2100, 2400, 2700, 3000, 3300, 3600, 3900] study_classes = [SafranSnowfall1Day, SafranSnowfall3Days, SafranSnowfall5Days, SafranSnowfall7Days][:2] study_classes = [SafranPrecipitation1Day, SafranPrecipitation3Days, SafranPrecipitation5Days, SafranPrecipitation7Days][:] @@ -41,7 +41,7 @@ def main(): for study_class in study_classes: studies = AltitudesStudies(study_class, altitudes, season=Season.winter_extended) - plot_time_series(studies, massif_names) + # plot_time_series(studies, massif_names) plot_moments(studies, massif_names) plot_altitudinal_fit(studies, massif_names) diff --git a/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py b/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py index 53d35149a3bb8cbb939e629403040c900c820ffe..b572ff609964b109e517a71667adde6a189ef293 100644 --- a/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py +++ b/test/test_extreme_fit/test_estimator/test_gev_spatio_temporal_extremes_mle.py @@ -53,7 +53,7 @@ class TestGevTemporalQuadraticExtremesMle(unittest.TestCase): def test_altitudinal_models(self): for model_class in ALTITUDINAL_MODELS: - print(model_class) + # print(model_class) self.common_test(model_class)