From ba9b09a0eb4310a94c95f3bbfabe013267986e5a Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Mon, 16 Nov 2020 20:46:42 +0100
Subject: [PATCH] [contrasting] fix one plot for the paper 2
---
.../altitudes_fit/main_altitudes_studies.py | 2 +-
...altitudes_studies_visualizer_for_non_stationary_models.py | 5 +++--
2 files changed, 4 insertions(+), 3 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 6dd7f47d..5bc947e3 100644
--- a/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py
+++ b/projects/altitude_spatial_model/altitudes_fit/main_altitudes_studies.py
@@ -32,7 +32,7 @@ def main():
altitudes_list = altitudes_for_groups[1:2]
elif fast:
massif_names = ['Vanoise', 'Haute-Maurienne', 'Vercors'][:]
- altitudes_list = altitudes_for_groups[2:3]
+ altitudes_list = altitudes_for_groups[3:]
else:
massif_names = None
altitudes_list = altitudes_for_groups[:]
diff --git a/projects/altitude_spatial_model/altitudes_fit/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py b/projects/altitude_spatial_model/altitudes_fit/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py
index e174d78c..26b3c970 100644
--- a/projects/altitude_spatial_model/altitudes_fit/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py
+++ b/projects/altitude_spatial_model/altitudes_fit/one_fold_analysis/altitudes_studies_visualizer_for_non_stationary_models.py
@@ -139,11 +139,13 @@ class AltitudesStudiesVisualizerForNonStationaryModels(StudyVisualizer):
massif_name_to_value = self.method_name_and_order_to_d(method_name, order)
# Plot settings
moment = ' '.join(method_name.split('_'))
- moment = moment.replace('moment', '{} in 2019'.format(OneFoldFit.get_moment_str(order=order)))
+ str_for_last_year = ' in 2019'
+ moment = moment.replace('moment', '{}{}'.format(OneFoldFit.get_moment_str(order=order), str_for_last_year))
plot_name = '{}{} '.format(OneFoldFit.folder_for_plots, moment)
massif_name_to_text = self.massif_name_to_best_name
if 'change' in method_name:
+ plot_name = plot_name.replace(str_for_last_year, '')
plot_name += ' between {} and {}'.format(2019 - 50, 2019)
if 'relative' not in method_name:
# Put the relative score as text on the plot for the change.
@@ -281,7 +283,6 @@ class AltitudesStudiesVisualizerForNonStationaryModels(StudyVisualizer):
altitude=self.altitude_group.reference_altitude,
add_colorbar=self.add_colorbar,
max_abs_change=max_abs_change,
- fit_method=self.fit_method,
xlabel=self.altitude_group.xlabel,
)
--
GitLab