From dbebba9fd87e8e0de99f4d5735d0854428080c49 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Mon, 1 Mar 2021 14:49:26 +0100
Subject: [PATCH] [refactor] fix imports.
---
.../independent_ensemble_fit.py | 6 ++----
.../independent_ensemble_fit/visualizer_merge.py | 3 +--
.../ensemble_fit/visualizer_for_projection_ensemble.py | 10 ++++------
.../ensemble_fit/visualizer_for_sensitivity.py | 6 ++----
.../one_fold_fit/utils_altitude_studies_visualizer.py | 2 +-
...main_elevation_temporal_for_projections_ensemble.py | 3 +--
6 files changed, 11 insertions(+), 19 deletions(-)
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 be9eba5e..9fb05952 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 b305af00..c48f1e5e 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 41ac5f3c..3149bab5 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 cba512b8..824328c8 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 526f486b..a6d6ae62 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 f0429155..09f9bdb3 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
--
GitLab