Commit 28c9d300 authored by Le Roux Erwan's avatar Le Roux Erwan
Browse files

[refactor] move altitudes_studies.py. create trend test folder inside extreme_trend.

parent 08ca4b88
No related merge requests found
Showing with 25 additions and 77 deletions
+25 -77
...@@ -3,7 +3,7 @@ from collections import OrderedDict ...@@ -3,7 +3,7 @@ from collections import OrderedDict
from extreme_data.meteo_france_data.scm_models_data.utils import Season, FrenchRegion from extreme_data.meteo_france_data.scm_models_data.utils import Season, FrenchRegion
from extreme_fit.model.margin_model.utils import \ from extreme_fit.model.margin_model.utils import \
MarginFitMethod MarginFitMethod
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends StudyVisualizerForNonStationaryTrends
......
...@@ -10,7 +10,7 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] ...@@ -10,7 +10,7 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
import matplotlib import matplotlib
matplotlib.use('Agg') matplotlib.use('Agg')
from projects.altitude_spatial_model.altitudes_fit.plots.plot_histogram_altitude_studies import \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.plots.plot_histogram_altitude_studies import \
plot_shoe_plot_changes_against_altitude, plot_histogram_all_trends_against_altitudes, \ plot_shoe_plot_changes_against_altitude, plot_histogram_all_trends_against_altitudes, \
plot_histogram_all_models_against_altitudes plot_histogram_all_models_against_altitudes
...@@ -20,11 +20,11 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra ...@@ -20,11 +20,11 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra
from extreme_fit.model.utils import set_seed_for_test from extreme_fit.model.utils import set_seed_for_test
from projects.altitude_spatial_model.altitudes_fit.plots.plot_coherence_curves import plot_coherence_curves from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.plots.plot_coherence_curves import plot_coherence_curves
from projects.altitude_spatial_model.altitudes_fit.utils_altitude_studies_visualizer import load_visualizer_list from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.utils_altitude_studies_visualizer import load_visualizer_list
from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import altitudes_for_groups from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import altitudes_for_groups
...@@ -85,7 +85,6 @@ def plot_visualizers(massif_names, visualizer_list): ...@@ -85,7 +85,6 @@ def plot_visualizers(massif_names, visualizer_list):
# plot_shoe_plot_ratio_interval_size_against_altitude(massif_names, visualizer_list) # plot_shoe_plot_ratio_interval_size_against_altitude(massif_names, visualizer_list)
for relative in [True, False]: for relative in [True, False]:
plot_shoe_plot_changes_against_altitude(massif_names, visualizer_list, relative=relative) plot_shoe_plot_changes_against_altitude(massif_names, visualizer_list, relative=relative)
# plot_coherence_curves(massif_names, visualizer_list)
plot_coherence_curves(['Vanoise'], visualizer_list) plot_coherence_curves(['Vanoise'], visualizer_list)
pass pass
......
from collections import Counter from collections import Counter
from math import ceil, floor from math import ceil, floor
from multiprocessing import Pool
from typing import List, Dict from typing import List, Dict
import matplotlib import matplotlib
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np import numpy as np
from cached_property import cached_property
from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_inverse_colormap, \
from extreme_data.meteo_france_data.scm_models_data.visualization.create_shifted_cmap import get_shifted_map, \ remove_the_extreme_colors
get_colors, ticks_values_and_labels_for_percentages, get_half_colormap, ticks_values_and_labels_for_positive_value, \
get_inverse_colormap, get_cmap_with_inverted_blue_and_green_channels, remove_the_extreme_colors
from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \
SCM_STUDY_CLASS_TO_ABBREVIATION, ALL_ALTITUDES_WITHOUT_NAN SCM_STUDY_CLASS_TO_ABBREVIATION
from extreme_data.meteo_france_data.scm_models_data.visualization.plot_utils import plot_against_altitude from extreme_data.meteo_france_data.scm_models_data.visualization.plot_utils import plot_against_altitude
from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer
from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.distribution.gev.gev_params import GevParams
...@@ -23,16 +19,14 @@ from extreme_fit.function.param_function.linear_coef import LinearCoef ...@@ -23,16 +19,14 @@ from extreme_fit.function.param_function.linear_coef import LinearCoef
from extreme_fit.model.margin_model.polynomial_margin_model.spatio_temporal_polynomial_model import \ from extreme_fit.model.margin_model.polynomial_margin_model.spatio_temporal_polynomial_model import \
AbstractSpatioTemporalPolynomialModel AbstractSpatioTemporalPolynomialModel
from extreme_fit.model.margin_model.utils import MarginFitMethod from extreme_fit.model.margin_model.utils import MarginFitMethod
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies 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 \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import \
get_altitude_group_from_altitudes, HighAltitudeGroup, VeyHighAltitudeGroup, MidAltitudeGroup get_altitude_group_from_altitudes, VeyHighAltitudeGroup, MidAltitudeGroup
from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.one_fold_fit import \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.one_fold_fit import \
OneFoldFit OneFoldFit
from root_utils import NB_CORES
from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \ from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_covariate_for_fit import \
AnomalyTemperatureTemporalCovariate AnomalyTemperatureTemporalCovariate
from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
class AltitudesStudiesVisualizerForNonStationaryModels(StudyVisualizer): class AltitudesStudiesVisualizerForNonStationaryModels(StudyVisualizer):
......
import math
from typing import List from typing import List
import numpy as np import numpy as np
...@@ -17,7 +16,7 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra ...@@ -17,7 +16,7 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra
from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels AltitudesStudiesVisualizerForNonStationaryModels
from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.one_fold_fit import OneFoldFit from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.one_fold_fit import OneFoldFit
from projects.altitude_spatial_model.altitudes_fit.plots.compute_histogram_change_in_total_snowfall import \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.plots.compute_histogram_change_in_total_snowfall import \
compute_changes_in_total_snowfall compute_changes_in_total_snowfall
...@@ -43,45 +42,6 @@ def plot_histogram_all_models_against_altitudes(massif_names, visualizer_list: L ...@@ -43,45 +42,6 @@ def plot_histogram_all_models_against_altitudes(massif_names, visualizer_list: L
print(model_name_to_mean_percentage[model_name], model_name_to_mean_percentage_significant[model_name], print(model_name_to_mean_percentage[model_name], model_name_to_mean_percentage_significant[model_name],
model_name) model_name)
# # Plot part
# ax = plt.gca()
# width = 5
# size = 8
# legend_fontsize = 10
# labelsize = 10
# linewidth = 1
# tick_list = np.array([((len(visualizer_list) + 2) * i + (1 + len(visualizer_list) / 2)) * width
# for i in range(len(sorted_model_names))])
# for tick_middle, model_name in zip(tick_list, sorted_model_names):
# x_shifted = [tick_middle + width * shift / 2 for shift in range(-3, 5, 2)]
# percentages = model_name_to_percentages[model_name]
# percentages_significant = model_name_to_percentages_significant[model_name]
# colors = ['white', 'yellow', 'orange', 'red']
# labels = ['{} m - {} m (\% out of {} massifs)'.format(1000 * i, 1000 * (i + 1),
# len(v.get_valid_names(massif_names))) for i, v in
# enumerate(visualizer_list)]
# for x, color, percentage, label, percentage_significant in zip(x_shifted, colors, percentages, labels,
# percentages_significant):
# ax.bar([x], [percentage], width=width, label=label,
# linewidth=2 * linewidth, edgecolor='black', color=color)
# heights = list(range(0, math.ceil(percentage_significant), 1))[::-1]
# for height in heights:
# ax.bar([x], [height], width=width, linewidth=linewidth, edgecolor='black', color=color)
#
# handles, labels = ax.get_legend_handles_labels()
# ax.legend(handles[:len(visualizer_list)], labels[:len(visualizer_list)], prop={'size': size})
# ax.set_xticklabels(sorted_model_names)
# ax.set_xticks(tick_list)
# ax.set_ylabel('Percentage of massifs (\%) ', fontsize=legend_fontsize)
# ax.set_xlabel('Models', fontsize=legend_fontsize)
# ax.set_ylim(bottom=0)
# ax.yaxis.grid()
# ax.tick_params(axis='both', which='major', labelsize=labelsize)
#
# visualizer.plot_name = 'All models'
# visualizer.show_or_save_to_file(add_classic_title=False, no_title=True)
# plt.close()
def plot_histogram_all_trends_against_altitudes(massif_names, visualizer_list: List[ def plot_histogram_all_trends_against_altitudes(massif_names, visualizer_list: List[
AltitudesStudiesVisualizerForNonStationaryModels], with_significance=True): AltitudesStudiesVisualizerForNonStationaryModels], with_significance=True):
......
from extreme_fit.model.margin_model.polynomial_margin_model.utils import \ from extreme_fit.model.margin_model.polynomial_margin_model.utils import \
ALTITUDINAL_GEV_MODELS_BASED_ON_POINTWISE_ANALYSIS ALTITUDINAL_GEV_MODELS_BASED_ON_POINTWISE_ANALYSIS
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies 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 projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitudes_studies_visualizer_for_non_stationary_models import \
AltitudesStudiesVisualizerForNonStationaryModels AltitudesStudiesVisualizerForNonStationaryModels
......
...@@ -2,7 +2,7 @@ from typing import Tuple, Dict, List ...@@ -2,7 +2,7 @@ from typing import Tuple, Dict, List
from cached_property import cached_property from cached_property import cached_property
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
from spatio_temporal_dataset.slicer.split import invert_s_split from spatio_temporal_dataset.slicer.split import invert_s_split
......
...@@ -13,7 +13,7 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.plot_utils imp ...@@ -13,7 +13,7 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.plot_utils imp
from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer
from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.distribution.gev.gev_params import GevParams
from extreme_fit.utils import fit_linear_regression from extreme_fit.utils import fit_linear_regression
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies 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 altitudes_for_groups from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import altitudes_for_groups
......
...@@ -7,7 +7,7 @@ import matplotlib ...@@ -7,7 +7,7 @@ import matplotlib
from extreme_data.meteo_france_data.scm_models_data.safran.gap_between_study import GapBetweenSafranSnowfall2019And2020, \ from extreme_data.meteo_france_data.scm_models_data.safran.gap_between_study import GapBetweenSafranSnowfall2019And2020, \
GapBetweenSafranSnowfall2019AndMySafranSnowfall2019Recentered, \ GapBetweenSafranSnowfall2019AndMySafranSnowfall2019Recentered, \
GapBetweenSafranSnowfall2019AndMySafranSnowfall2019NotRecentered GapBetweenSafranSnowfall2019AndMySafranSnowfall2019NotRecentered
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
matplotlib.use('Agg') matplotlib.use('Agg')
......
...@@ -5,8 +5,7 @@ import calendar ...@@ -5,8 +5,7 @@ import calendar
import numpy as np import numpy as np
from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day from extreme_data.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall1Day
from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import StudyVisualizer from extreme_data.meteo_france_data.scm_models_data.altitudes_studies import AltitudesStudies
from projects.altitude_spatial_model.altitudes_fit.altitudes_studies import AltitudesStudies
from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import altitudes_for_groups, \ from projects.altitude_spatial_model.altitudes_fit.one_fold_analysis.altitude_group import altitudes_for_groups, \
get_altitude_group_from_altitudes get_altitude_group_from_altitudes
......
import pandas as pd import pandas as pd
from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import StudyVisualizerForNonStationaryTrends from extreme_trend.trend_test.visualizers import StudyVisualizerForNonStationaryTrends
def mix_dsitrbution_impact(): def mix_dsitrbution_impact():
......
...@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt ...@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN ALL_ALTITUDES_WITHOUT_NAN
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends StudyVisualizerForNonStationaryTrends
......
...@@ -11,7 +11,7 @@ from extreme_fit.model.margin_model.utils import \ ...@@ -11,7 +11,7 @@ from extreme_fit.model.margin_model.utils import \
MarginFitMethod MarginFitMethod
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
AbstractExtractEurocodeReturnLevel AbstractExtractEurocodeReturnLevel
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends StudyVisualizerForNonStationaryTrends
from extreme_fit.distribution.gev.gev_params import GevParams from extreme_fit.distribution.gev.gev_params import GevParams
from projects.exceeding_snow_loads.section_data.main_example_swe_total_plot import tuples_for_examples_paper1 from projects.exceeding_snow_loads.section_data.main_example_swe_total_plot import tuples_for_examples_paper1
......
...@@ -3,7 +3,7 @@ from typing import Dict ...@@ -3,7 +3,7 @@ from typing import Dict
import pandas as pd import pandas as pd
from extreme_data.eurocode_data.utils import EUROCODE_ALTITUDES from extreme_data.eurocode_data.utils import EUROCODE_ALTITUDES
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty
......
...@@ -4,7 +4,7 @@ import numpy as np ...@@ -4,7 +4,7 @@ import numpy as np
from cached_property import cached_property from cached_property import cached_property
from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends StudyVisualizerForNonStationaryTrends
......
...@@ -2,9 +2,6 @@ from multiprocessing.pool import Pool ...@@ -2,9 +2,6 @@ from multiprocessing.pool import Pool
import matplotlib as mpl import matplotlib as mpl
from projects.exceeding_snow_loads.checks.qqplot.plot_qqplot import \
plot_intensity_against_gumbel_quantile_for_3_examples, plot_full_diagnostic
from projects.exceeding_snow_loads.section_results.plot_selection_curves import plot_selection_curves
from projects.exceeding_snow_loads.section_results.plot_trend_curves import plot_trend_map, plot_trend_curves from projects.exceeding_snow_loads.section_results.plot_trend_curves import plot_trend_map, plot_trend_curves
from projects.exceeding_snow_loads.section_results.plot_uncertainty_histogram import plot_uncertainty_histogram from projects.exceeding_snow_loads.section_results.plot_uncertainty_histogram import plot_uncertainty_histogram
...@@ -14,10 +11,9 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] ...@@ -14,10 +11,9 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}']
from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoadEurocode from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoadEurocode
from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \ from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
ConfidenceIntervalMethodFromExtremes ConfidenceIntervalMethodFromExtremes
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty
from extreme_trend.visualizers.utils import load_altitude_to_visualizer from extreme_trend.trend_test.visualizers import load_altitude_to_visualizer
from projects.exceeding_snow_loads.section_results.plot_uncertainty_curves import plot_uncertainty_massifs
from projects.exceeding_snow_loads.utils import paper_study_classes, paper_altitudes from projects.exceeding_snow_loads.utils import paper_study_classes, paper_altitudes
from root_utils import NB_CORES from root_utils import NB_CORES
......
from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from extreme_trend.visualizers.study_visualizer_for_shape_repartition import \ from extreme_trend.trend_test.visualizers import \
StudyVisualizerForShape StudyVisualizerForShape
from extreme_trend.visualizers.utils import load_altitude_to_visualizer from extreme_trend.trend_test.visualizers import load_altitude_to_visualizer
def main_shape_repartition(altitudes, massif_names=None, def main_shape_repartition(altitudes, massif_names=None,
......
...@@ -2,7 +2,7 @@ import matplotlib.pyplot as plt ...@@ -2,7 +2,7 @@ import matplotlib.pyplot as plt
from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \ from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import \
ConfidenceIntervalMethodFromExtremes ConfidenceIntervalMethodFromExtremes
from extreme_trend.visualizers.study_visualizer_for_non_stationary_trends import ModelSubsetForUncertainty from extreme_trend.trend_test.visualizers import ModelSubsetForUncertainty
def plot_diagnosis_risk(altitude_to_visualizer): def plot_diagnosis_risk(altitude_to_visualizer):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment