From f575d8e7afb03eb0eab3cdb257b48bcbfbab0ea4 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Tue, 2 Feb 2021 13:00:12 +0100
Subject: [PATCH] [contrasting] add fix for the multiprocessing, and the thread
---
.../altitudes_fit/main_altitudes_studies.py | 19 +++++++++++--------
.../plots/plot_histogram_altitude_studies.py | 7 +++++--
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py
index 2d6d27af..9aa9a2fd 100644
--- a/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py
+++ b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py
@@ -2,6 +2,9 @@ import datetime
import time
from typing import List
+import matplotlib
+matplotlib.use('Agg')
+
import matplotlib as mpl
from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal, CrocusSnowLoad3Days
@@ -31,10 +34,10 @@ def main():
set_seed_for_test()
- fast = True
+ fast = False
if fast is None:
- massif_names = ['Vanoise', 'Haute-Maurienne', 'Vercors']
- altitudes_list = altitudes_for_groups[1:2]
+ massif_names = None
+ altitudes_list = altitudes_for_groups[2:3]
elif fast:
massif_names = ['Vanoise', 'Haute-Maurienne', 'Vercors'][:1]
altitudes_list = altitudes_for_groups[3:]
@@ -65,10 +68,10 @@ def main_loop(altitudes_list, massif_names, seasons, study_classes):
def plot_visualizers(massif_names, visualizer_list):
- # plot_histogram_all_trends_against_altitudes(massif_names, visualizer_list)
- # plot_shoe_plot_ratio_interval_size_against_altitude(massif_names, visualizer_list)
- # for relative in [True, False]:
- # plot_shoe_plot_changes_against_altitude(massif_names, visualizer_list, relative=relative)
+ plot_histogram_all_trends_against_altitudes(massif_names, visualizer_list)
+ plot_shoe_plot_ratio_interval_size_against_altitude(massif_names, visualizer_list)
+ for relative in [True, False]:
+ 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)
@@ -79,7 +82,7 @@ def plot_visualizer(massif_names, visualizer):
# visualizer.studies.plot_maxima_time_series(['Vanoise'])
# Plot the results for the model that minimizes the individual aic
- # plot_individual_aic(visualizer)
+ plot_individual_aic(visualizer)
# Plot the results for the model that minimizes the total aic
diff --git a/projects/altitude_spatial_model/altitudes_fit/plots/plot_histogram_altitude_studies.py b/projects/altitude_spatial_model/altitudes_fit/plots/plot_histogram_altitude_studies.py
index 77d85d41..27dd6855 100644
--- a/projects/altitude_spatial_model/altitudes_fit/plots/plot_histogram_altitude_studies.py
+++ b/projects/altitude_spatial_model/altitudes_fit/plots/plot_histogram_altitude_studies.py
@@ -3,7 +3,10 @@ from typing import List
import numpy as np
+import matplotlib
+matplotlib.use('Agg')
import matplotlib.pyplot as plt
+
from matplotlib.lines import Line2D
from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \
@@ -111,8 +114,8 @@ def plot_histogram_all_trends_against_altitudes(massif_names, visualizer_list: L
ax.tick_params(axis='both', which='major', labelsize=labelsize)
ax.set_xticks(x)
ax.yaxis.grid()
- ax.set_ylim([0, 69])
- # ax.set_ylim(bottom=0)
+ ax.set_ylim([0, 89])
+ ax.set_ylim(bottom=0)
ax.set_xticklabels([v.altitude_group.formula_upper for v in visualizer_list])
plot_nb_massif_on_upper_axis(ax, labelsize, legend_fontsize, nb_massifs, x)
--
GitLab