diff --git a/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py b/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py index be9eba5e71b4f208481ae84b246bd95b216188a4..9fb05952e55029dafbad8b4e3322f10e9a94e0a9 100644 --- a/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py +++ b/extreme_trend/ensemble_fit/independent_ensemble_fit/independent_ensemble_fit.py @@ -1,12 +1,10 @@ import numpy as np +from extreme_trend.ensemble_fit.abstract_ensemble_fit import AbstractEnsembleFit +from extreme_trend.ensemble_fit.independent_ensemble_fit.visualizer_merge import VisualizerMerge from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \ AltitudesStudiesVisualizerForNonStationaryModels from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit -from extreme_trend.elevation_temporal_model_for_projections.abstract_ensemble_fit import \ - AbstractEnsembleFit -from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \ - VisualizerMerge class IndependentEnsembleFit(AbstractEnsembleFit): diff --git a/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py b/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py index b305af00cff80e7f2ad3029bf13c673e5352ecc2..c48f1e5eb231ba7e15810179614f0a4de4ba74d1 100644 --- a/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py +++ b/extreme_trend/ensemble_fit/independent_ensemble_fit/visualizer_merge.py @@ -3,11 +3,10 @@ from typing import Dict, List import numpy as np from extreme_fit.model.margin_model.utils import MarginFitMethod +from extreme_trend.ensemble_fit.independent_ensemble_fit.one_fold_fit_merge import OneFoldFitMerge from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \ AltitudesStudiesVisualizerForNonStationaryModels from extreme_trend.one_fold_fit.one_fold_fit import OneFoldFit -from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \ - OneFoldFitMerge class VisualizerMerge(AltitudesStudiesVisualizerForNonStationaryModels): diff --git a/extreme_trend/ensemble_fit/visualizer_for_projection_ensemble.py b/extreme_trend/ensemble_fit/visualizer_for_projection_ensemble.py index 41ac5f3cab7587928c48b0c470cbdd425c0c3ba6..3149bab5293927f4377120794cc3a352bf89fab9 100644 --- a/extreme_trend/ensemble_fit/visualizer_for_projection_ensemble.py +++ b/extreme_trend/ensemble_fit/visualizer_for_projection_ensemble.py @@ -4,13 +4,11 @@ from extreme_fit.model.margin_model.polynomial_margin_model.spatio_temporal_poly AbstractSpatioTemporalPolynomialModel from extreme_fit.model.margin_model.utils import MarginFitMethod from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies -from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import \ - get_altitude_class_from_altitudes -from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.plots.plot_histogram_altitude_studies import \ +from extreme_trend.ensemble_fit.independent_ensemble_fit.independent_ensemble_fit import IndependentEnsembleFit +from extreme_trend.one_fold_fit.altitude_group import get_altitude_class_from_altitudes +from extreme_trend.one_fold_fit.plots.plot_histogram_altitude_studies import \ plot_histogram_all_trends_against_altitudes, plot_shoe_plot_changes_against_altitude -from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.utils_altitude_studies_visualizer import compute_and_assign_max_abs -from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit import \ - IndependentEnsembleFit +from extreme_trend.one_fold_fit.utils_altitude_studies_visualizer import compute_and_assign_max_abs class VisualizerForProjectionEnsemble(object): diff --git a/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py b/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py index cba512b8cbd14c9e291d1224f453e08c3b0e8e84..824328c8d61f25a921ba5ce493cd18abdabdeb52 100644 --- a/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py +++ b/extreme_trend/ensemble_fit/visualizer_for_sensitivity.py @@ -8,10 +8,8 @@ from extreme_data.meteo_france_data.scm_models_data.utils import Season from extreme_fit.model.margin_model.polynomial_margin_model.spatio_temporal_polynomial_model import \ AbstractSpatioTemporalPolynomialModel from extreme_fit.model.margin_model.utils import MarginFitMethod -from extreme_trend.elevation_temporal_model_for_projections.independent_ensemble_fit.independent_ensemble_fit import \ - IndependentEnsembleFit -from extreme_trend.elevation_temporal_model_for_projections.visualizer_for_projection_ensemble import \ - VisualizerForProjectionEnsemble +from extreme_trend.ensemble_fit.independent_ensemble_fit.independent_ensemble_fit import IndependentEnsembleFit +from extreme_trend.ensemble_fit.visualizer_for_projection_ensemble import VisualizerForProjectionEnsemble from extreme_trend.one_fold_fit.altitude_group import get_altitude_class_from_altitudes, \ get_linestyle_for_altitude_class diff --git a/extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py b/extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py index 526f486bb4555e9d04d79ac48067b24bd9fc0cbd..a6d6ae62bcada070bb355c2328546aca733703ac 100644 --- a/extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py +++ b/extreme_trend/one_fold_fit/utils_altitude_studies_visualizer.py @@ -1,7 +1,7 @@ from extreme_fit.model.margin_model.polynomial_margin_model.utils import \ ALTITUDINAL_GEV_MODELS_BASED_ON_POINTWISE_ANALYSIS from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies -from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \ +from extreme_trend.one_fold_fit.altitudes_studies_visualizer_for_non_stationary_models import \ AltitudesStudiesVisualizerForNonStationaryModels diff --git a/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py b/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py index f0429155e743a4488df44e45106ec904f33523f7..09f9bdb3ba74e52f6a754bdc329df49157fc2d2f 100644 --- a/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py +++ b/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py @@ -4,11 +4,10 @@ from typing import List import matplotlib as mpl -from extreme_trend.elevation_temporal_model_for_projections.visualizer_for_sensitivity import \ - VisualizerForSensivity from extreme_trend.ensemble_fit.independent_ensemble_fit.independent_ensemble_fit import IndependentEnsembleFit from extreme_trend.ensemble_fit.visualizer_for_projection_ensemble import VisualizerForProjectionEnsemble +from extreme_trend.ensemble_fit.visualizer_for_sensitivity import VisualizerForSensivity from spatio_temporal_dataset.coordinates.temporal_coordinates.temperature_covariate import \ AnomalyTemperatureWithSplineTemporalCovariate