Commit 8b5ee035 authored by Le Roux Erwan's avatar Le Roux Erwan
Browse files

[paper 1] add some remarks, or modify to main scripts

parent 44f8eb9d
No related merge requests found
Showing with 9 additions and 6 deletions
+9 -6
...@@ -6,7 +6,7 @@ NB_DAYS = [1, 3, 5, 7] ...@@ -6,7 +6,7 @@ NB_DAYS = [1, 3, 5, 7]
class CumulatedStudy(AbstractStudy): class CumulatedStudy(AbstractStudy):
def __init__(self, variable_class: type, nb_consecutive_days: int = 3, *args, **kwargs): def __init__(self, variable_class: type, nb_consecutive_days: int = 3, *args, **kwargs):
assert nb_consecutive_days in NB_DAYS assert nb_consecutive_days in NB_DAYS, nb_consecutive_days
super().__init__(variable_class, *args, **kwargs) super().__init__(variable_class, *args, **kwargs)
self.nb_consecutive_days = nb_consecutive_days self.nb_consecutive_days = nb_consecutive_days
......
...@@ -68,6 +68,7 @@ class SafranSnowfallVariable(AbstractVariable): ...@@ -68,6 +68,7 @@ class SafranSnowfallVariable(AbstractVariable):
class SafranRainfallVariable(SafranSnowfallVariable): class SafranRainfallVariable(SafranSnowfallVariable):
"""Warning: this corresponds to water falling. Total precipitaiton equals Rainfall + Snowfall"""
NAME = 'Rainfall' NAME = 'Rainfall'
@classmethod @classmethod
......
...@@ -8,7 +8,7 @@ from matplotlib.ticker import PercentFormatter ...@@ -8,7 +8,7 @@ from matplotlib.ticker import PercentFormatter
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \ from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
ALL_ALTITUDES_WITHOUT_NAN ALL_ALTITUDES_WITHOUT_NAN
from experiment.paper_past_snow_loads.data.main_example_swe_total_plot import marker_altitude_massif_name_for_paper1 from experiment.paper_past_snow_loads.data.main_example_swe_total_plot import tuples_for_examples_paper1
from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \ from experiment.paper_past_snow_loads.study_visualizer_for_non_stationary_trends import \
StudyVisualizerForNonStationaryTrends StudyVisualizerForNonStationaryTrends
...@@ -29,6 +29,7 @@ def plot_qqplot_for_time_series_with_missing_zeros( ...@@ -29,6 +29,7 @@ def plot_qqplot_for_time_series_with_missing_zeros(
def plot_qqplot_for_time_series_examples(altitude_to_visualizer: Dict[int, StudyVisualizerForNonStationaryTrends]): def plot_qqplot_for_time_series_examples(altitude_to_visualizer: Dict[int, StudyVisualizerForNonStationaryTrends]):
marker_altitude_massif_name_for_paper1 = tuples_for_examples_paper1()
for color, a, m in marker_altitude_massif_name_for_paper1: for color, a, m in marker_altitude_massif_name_for_paper1:
v = altitude_to_visualizer[a] v = altitude_to_visualizer[a]
v.qqplot(m, color) v.qqplot(m, color)
...@@ -60,7 +61,8 @@ def plot_hist_psnow(altitude_to_visualizer: Dict[int, StudyVisualizerForNonStati ...@@ -60,7 +61,8 @@ def plot_hist_psnow(altitude_to_visualizer: Dict[int, StudyVisualizerForNonStati
if __name__ == '__main__': if __name__ == '__main__':
# altitudes = [300, 600, 900, 1200, 1500, 1800][:2] # altitudes = [300, 600, 900, 1200, 1500, 1800][:2]
altitudes = ALL_ALTITUDES_WITHOUT_NAN # altitudes = ALL_ALTITUDES_WITHOUT_NAN
altitudes = [900, 1800, 2700]
altitude_to_visualizer = {altitude: StudyVisualizerForNonStationaryTrends(CrocusSnowLoadTotal(altitude=altitude), altitude_to_visualizer = {altitude: StudyVisualizerForNonStationaryTrends(CrocusSnowLoadTotal(altitude=altitude),
multiprocessing=True) multiprocessing=True)
for altitude in altitudes} for altitude in altitudes}
......
...@@ -19,9 +19,9 @@ def main_shape_repartition(altitudes, massif_names=None, ...@@ -19,9 +19,9 @@ def main_shape_repartition(altitudes, massif_names=None,
if altitude in altitudes_for_plot_trend] if altitude in altitudes_for_plot_trend]
max_abs_tdrl = max([visualizer.max_abs_change for visualizer in visualizers_for_altitudes]) max_abs_tdrl = max([visualizer.max_abs_change for visualizer in visualizers_for_altitudes])
for visualizer in visualizers_for_altitudes: for visualizer in visualizers_for_altitudes:
# visualizer.plot_trends(max_abs_tdrl, add_colorbar=visualizer.study.altitude == 2700) visualizer.plot_trends(max_abs_tdrl, add_colorbar=visualizer.study.altitude == 2700)
# visualizer.plot_trends(max_abs_tdrl, add_colorbar=True) # visualizer.plot_trends(max_abs_tdrl, add_colorbar=True)
visualizer.plot_trends() # visualizer.plot_trends()
if __name__ == '__main__': if __name__ == '__main__':
......
...@@ -99,7 +99,7 @@ def major_result(): ...@@ -99,7 +99,7 @@ def major_result():
if __name__ == '__main__': if __name__ == '__main__':
major_result() major_result()
# intermediate_result(altitudes=[900, 1200], massif_names=['Vercors'], # intermediate_result(altitudes=[900, 1200], massif_names=['Chartreuse'],
# uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.my_bayes, # uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.my_bayes,
# ConfidenceIntervalMethodFromExtremes.ci_mle][1:], # ConfidenceIntervalMethodFromExtremes.ci_mle][1:],
# multiprocessing=True) # multiprocessing=True)
......
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