From 63d9d31ff25b27fbfaa1641534e164336b00d406 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Thu, 28 Feb 2019 12:11:28 +0100
Subject: [PATCH] [SCM] improve name display for crocus variables.
---
experiment/meteo_france_SCM_study/crocus/crocus.py | 5 ++++-
experiment/meteo_france_SCM_study/main_visualize.py | 8 ++++----
.../safran/safran_visualizer.py | 13 +++++++++----
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/experiment/meteo_france_SCM_study/crocus/crocus.py b/experiment/meteo_france_SCM_study/crocus/crocus.py
index 43caec2a..d6f3e215 100644
--- a/experiment/meteo_france_SCM_study/crocus/crocus.py
+++ b/experiment/meteo_france_SCM_study/crocus/crocus.py
@@ -15,13 +15,16 @@ class Crocus(AbstractStudy):
super().__init__(variable_class, altitude)
self.model_name = 'Crocus'
+ @property
+ def variable_name(self):
+ suffix = '' if self.altitude == 2400 else ' average of data observed every 6 hours'
+ return super().variable_name + suffix
class CrocusSwe(Crocus):
def __init__(self, altitude=1800):
super().__init__(CrocusSweVariable, altitude)
-
class ExtendedCrocusSwe(AbstractExtendedStudy, CrocusSwe):
pass
diff --git a/experiment/meteo_france_SCM_study/main_visualize.py b/experiment/meteo_france_SCM_study/main_visualize.py
index 3156b628..6dba3107 100644
--- a/experiment/meteo_france_SCM_study/main_visualize.py
+++ b/experiment/meteo_france_SCM_study/main_visualize.py
@@ -33,11 +33,11 @@ def study_iterator(study_class, only_first_one=False, both_altitude=False, verbo
def extended_visualization():
- save_to_file = False
- only_first_one = True
- for study_class in SCM_EXTENDED_STUDIES[:1]:
+ save_to_file = True
+ only_first_one = False
+ for study_class in SCM_EXTENDED_STUDIES[:]:
for study in study_iterator(study_class, only_first_one=only_first_one):
- study_visualizer = StudyVisualizer(study, save_to_file=save_to_file, only_first_row=True)
+ study_visualizer = StudyVisualizer(study, save_to_file=save_to_file, only_one_graph=True)
# study_visualizer.visualize_all_mean_and_max_graphs()
study_visualizer.visualize_all_experimental_law()
# for study_class in SCM_EXTENDED_STUDIES[:]:
diff --git a/experiment/meteo_france_SCM_study/safran/safran_visualizer.py b/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
index ecb3515f..1f5b1802 100644
--- a/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
+++ b/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
@@ -146,11 +146,16 @@ class StudyVisualizer(object):
label_function = ax.set_ylabel if self.vertical_kde_plot else ax.set_xlabel
label_function(xlabel)
sorted_x_levels = sorted(list([x_level for x_level, _ in name_to_xlevel_and_color.values()]))
- extraticks = [float(float_to_str_with_only_some_significant_digits(x, nb_digits=2))
- for x in sorted_x_levels]
- if not self.only_one_graph:
- extraticks = [name_to_xlevel_and_color['mean'][0], name_to_xlevel_and_color[AbstractParams.QUANTILE_100][0]]
+
+ # Take all the ticks
+ # extraticks = [float(float_to_str_with_only_some_significant_digits(x, nb_digits=2))
+ # for x in sorted_x_levels]
+ # Display only some specific ticks
+ extraticks = [name_to_xlevel_and_color['mean'][0], name_to_xlevel_and_color[AbstractParams.QUANTILE_100][0]]
+
set_ticks_function = ax.set_yticks if self.vertical_kde_plot else ax.set_xticks
+ # Round up the ticks with a given number of significative digits
+ extraticks = [float(float_to_str_with_only_some_significant_digits(t, nb_digits=2)) for t in extraticks]
set_ticks_function(extraticks)
if not self.only_one_graph:
ax.set_title(self.study.safran_massif_names[massif_id])
--
GitLab