From 11f481df960853c6ebed94595e159a5b92564674 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Wed, 29 May 2019 18:06:11 +0200
Subject: [PATCH] [HYPERCUBE VISUALIZER] small refacatoring
---
.../altitude_hypercube_visualizer.py | 9 ++++++---
.../main_hypercube_visualization.py | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/experiment/meteo_france_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py b/experiment/meteo_france_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
index c216f6e2..3f1e44af 100644
--- a/experiment/meteo_france_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
+++ b/experiment/meteo_france_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
@@ -25,7 +25,7 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
@property
def nb_axes(self):
- return 2
+ return 1
def trend_type_to_series(self, reduction_function):
# Map each trend type to its serie with percentages
@@ -72,6 +72,8 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
subtitle=''):
if axes is None:
fig, axes = plt.subplots(self.nb_axes, 1, figsize=self.study_visualizer.figsize)
+ if not isinstance(axes, np.ndarray):
+ axes = [axes]
trend_type_to_series = self.trend_type_to_series(reduction_function)
for ax_idx, ax in enumerate(axes):
@@ -168,13 +170,14 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
class Altitude_Hypercube_Year_Visualizer(AltitudeHypercubeVisualizer):
def get_title_plot(self, xlabel, ax_idx=None):
- if ax_idx == 2:
+ if ax_idx == self.nb_axes - 1:
return 'mean starting year'
return super().get_title_plot(xlabel, ax_idx)
@property
def nb_axes(self):
- return 3
+ return super().nb_axes + 1
+
@staticmethod
def index_reduction(df, level):
diff --git a/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py b/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py
index 2669bf07..142ac101 100644
--- a/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py
+++ b/experiment/meteo_france_data/visualization/hypercube_visualization/main_hypercube_visualization.py
@@ -54,7 +54,7 @@ def full_quantity_altitude_hypercube():
def fast_altitude_hypercube():
- save_to_file = True
+ save_to_file = False
only_first_one = False
fast = True
altitudes = ALL_ALTITUDES[2:4]
@@ -131,8 +131,8 @@ def fast_quantity_altitude_hypercube():
def main_run():
- fast_altitude_hypercube()
- # fast_altitude_year_hypercube()
+ # fast_altitude_hypercube()
+ fast_altitude_year_hypercube()
# full_altitude_year_hypercube()
# fast_quantity_altitude_hypercube()
# full_quantity_altitude_hypercube()
--
GitLab