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 6dd7f47dbcb1103ddba5c99dac79a8accd4fcfd8..5bc947e3580c62bbf2efdf66fd64c44f7314826f 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 e174d78c25ca3aa4bf02da789816900c436bd36f..26b3c9709feb36dd24b66d80d0a34a220451a0de 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, )