diff --git a/extreme_data/meteo_france_data/scm_models_data/safran/safran.py b/extreme_data/meteo_france_data/scm_models_data/safran/safran.py index e0fad5e0d7a9e650ef0f64c64d2052ed09074b56..ac0024d7abbfb034995262c3f8e91225d3b6c53f 100644 --- a/extreme_data/meteo_france_data/scm_models_data/safran/safran.py +++ b/extreme_data/meteo_france_data/scm_models_data/safran/safran.py @@ -89,7 +89,6 @@ class SafranRainfall7Days(SafranRainfall): super().__init__(nb_consecutive_days=7, **kwargs) - class SafranNormalizedPreciptationRate(CumulatedStudy, Safran): def __init__(self, **kwargs): @@ -103,6 +102,7 @@ class SafranNormalizedPreciptationRate(CumulatedStudy, Safran): return self.variable_class(variable_array_temperature, variable_array_snowfall, variable_array_rainfall, self.nb_consecutive_days) + class SafranNormalizedPreciptationRateOnWetDays(CumulatedStudy, Safran): def __init__(self, **kwargs): diff --git a/run_test_coverage.py b/run_test_coverage.py index 620caa4d8c16060dd59e3b46aad23e341b480f74..666721c826d9cf0be92672d435f2585dcaf10749 100644 --- a/run_test_coverage.py +++ b/run_test_coverage.py @@ -25,5 +25,5 @@ def display_last_test_coverage(): if __name__ == '__main__': - # run_test_coverage() + run_test_coverage() display_last_test_coverage() diff --git a/spatio_temporal_dataset/slicer/split.py b/spatio_temporal_dataset/slicer/split.py index 584f8c4aa5464e473241d0d84d44912d8cdd6d92..ac18f76a9fb600246e2c620c2bcbc12379a7ca3c 100644 --- a/spatio_temporal_dataset/slicer/split.py +++ b/spatio_temporal_dataset/slicer/split.py @@ -19,24 +19,6 @@ class Split(Enum): test_temporal = 8 -def split_to_display_kwargs(split: Split): - marker = None - gridsize = 1000 - if 'train' in split.name: - linewidth = 0.5 - else: - linewidth = 2 - if 'spatiotemporal' in split.name: - gridsize = 20 - if 'spatial' in split.name and 'temporal' in split.name: - marker = '*' - elif 'spatial' in split.name: - marker = '^' - else: - marker = '>' - return {'marker': marker, 'linewidth': linewidth, 'gridsize': gridsize} - - ALL_SPLITS_EXCEPT_ALL = [split for split in Split if split is not Split.all] SPLIT_NAME = 'split' diff --git a/test/test_extreme_data/test_meteo_france_data/test_variables.py b/test/test_extreme_data/test_meteo_france_data/test_variables.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/test_projects/test_contrasting/test_two_fold_fit.py b/test/test_projects/test_contrasting/test_two_fold_fit.py index 8530a74ea69561673b521ecdffdbbb62d946bb5d..27e7421a60f255939be62453f4288a34734aea25 100644 --- a/test/test_projects/test_contrasting/test_two_fold_fit.py +++ b/test/test_projects/test_contrasting/test_two_fold_fit.py @@ -33,7 +33,10 @@ class TestTwoFoldFit(unittest.TestCase): def test_best_fit_spatial_extreme(self): two_fold_fit = self.load_two_fold_fit(fit_method=MarginFitMethod.spatial_extremes_mle) - best_model_class = two_fold_fit.massif_name_to_best_model()['Vercors'] + try: + best_model_class = two_fold_fit.massif_name_to_best_model()['Vercors'] + except AssertionError as e: + self.assertTrue(False, msg=e.__str__()) self.assertEqual(best_model_class, LinearLocationAllDimsMarginModel)