diff --git a/experiment/meteo_france_data/scm_models_data/abstract_study.py b/experiment/meteo_france_data/scm_models_data/abstract_study.py
index ebe76ecf845166f1ca60d9f23f4ec97716d77ac8..ff8ffbbc4d1c66e745e5997a0247ba542dd99e82 100644
--- a/experiment/meteo_france_data/scm_models_data/abstract_study.py
+++ b/experiment/meteo_france_data/scm_models_data/abstract_study.py
@@ -276,7 +276,6 @@ class AbstractStudy(object):
# ax.scatter(x, y)
# ax.text(x, y, massif_name)
# Display the center of the massif
- print(massif_names)
masssif_coordinate_for_display = cls.massifs_coordinates_for_display(massif_names)
ax.scatter(masssif_coordinate_for_display.x_coordinates,
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
index 7a35e9d0a787218d44db5745f25baf4f4ad3c450..4d5cbc1ba23002a3925a26c5611577622e09ad4f 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from experiment.meteo_france_data.scm_models_data.visualization.hypercube_visualization.abstract_hypercube_visualizer import \
AbstractHypercubeVisualizer
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
- SCM_STUDY_NAME_TO_COLOR, SCM_STUDY_NAME_TO_ABBREVIATION, SCM_STUDY_CLASS_TO_ABBREVIATION
+ SCM_STUDY_NAME_TO_COLOR, SCM_STUDY_NAME_TO_ABBREVIATION, SCM_STUDY_CLASS_TO_ABBREVIATION, SCM_STUDIES_NAMES
from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
StudyVisualizer
from experiment.trend_analysis.univariate_test.abstract_univariate_test import AbstractUnivariateTest
@@ -15,6 +15,13 @@ ALTITUDES_XLABEL = 'altitudes'
STARTING_YEARS_XLABEL = 'starting years'
+def make_patch_spines_invisible(ax):
+ ax.set_frame_on(True)
+ ax.patch.set_visible(False)
+ for sp in ax.spines.values():
+ sp.set_visible(False)
+
+
class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
@property
@@ -95,7 +102,7 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
def visualize_trend_test_evolution(self, reduction_function, xlabel, xlabel_values, axes=None, marker='o',
subtitle='', isin_parameters=None,
- plot_title=None):
+ plot_title=None, idx_reduction=None):
# Plot in one graph several graph that correspond to the same trend_type
trend_type_to_series = self.trend_type_to_series(reduction_function, isin_parameters)
@@ -144,22 +151,32 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
if subtitle in SCM_STUDY_NAME_TO_COLOR:
ax_reversed, color = ax.twinx(), SCM_STUDY_NAME_TO_COLOR[subtitle]
- ylabel = SCM_STUDY_NAME_TO_ABBREVIATION[subtitle]
+ ylabel = 'mean logLik for ' + SCM_STUDY_NAME_TO_ABBREVIATION[subtitle]
ax.plot([], [], label=ylabel, color=color)
ax_reversed.plot(xlabel_values, values, label=ylabel, color=color)
ax_reversed.set_ylabel(ylabel, color=color)
+ ax_reversed.axvline(x=best_year, color=color, linestyle='--')
+
+ # Offset the right spine of par2. The ticks and label have already been
+ # placed on the right by twinx above.
+ factor = SCM_STUDIES_NAMES.index(subtitle)
+ position = 1 + idx_reduction * 0.08
+ if idx_reduction > 0:
+ ax_reversed.spines["right"].set_position(("axes", position))
+ # Having been created by twinx, par2 has its frame off, so the line of its
+ # detached spine is invisible. First, activate the frame but make the patch
+ # and spines invisible.
+ make_patch_spines_invisible(ax_reversed)
+ # Second, show the right spine.
+ ax_reversed.spines["right"].set_visible(True)
else:
ax.set_title(plot_title)
- ax.legend()
+ # ax.legend()
# Common things to all the graph
ax.set_xlabel(xlabel)
plt.setp(ax.get_yticklabels(), visible=False)
- specific_title = 'Evolution of {} trends wrt to the {} with {}'.format(subtitle, xlabel,
- self.trend_test_name)
- specific_title += '\n ' + self.get_title_plot(xlabel)
- if len(self.altitudes) == 1:
- specific_title += ' altitude={}'.format(self.altitudes[0])
+ specific_title = self.specific_title_trend_evolution(subtitle, xlabel, loglik_title=len(axes_remaining) > 0)
# Figure title
# specific_title += '\n'
@@ -177,6 +194,16 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
return specific_title, best_year
+ def specific_title_trend_evolution(self, subtitle, xlabel, loglik_title=False):
+ if loglik_title:
+ specific_title = 'Mean LogLik of the non stationary model'
+ else:
+ specific_title = 'Evolution of {} trends'.format(subtitle)
+ specific_title += ' wrt to the {}'.format(xlabel)
+ if len(self.altitudes) == 1:
+ specific_title += ' at altitude={}m'.format(self.altitudes[0])
+ return specific_title
+
def load_trend_test_evolution_axes(self, nb_rows):
fig, axes = plt.subplots(nb_rows, 1, figsize=self.study_visualizer.figsize, constrained_layout=True)
if not isinstance(axes, np.ndarray):
@@ -241,7 +268,6 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
color = style[:1]
serie = trend_type_to_serie[display_trend_type]
massif_to_value = dict(serie)
- print(massif_to_value)
massif_to_color.update({k: color for k, v in massif_to_value.items() if not np.isnan(v)})
self.study.visualize_study(ax, massif_name_to_color=massif_to_color, show=False)
@@ -250,11 +276,15 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
# row_title = self.get_title_plot(xlabel='massifs', ax_idx=i)
# StudyVisualizer.clean_axes_write_title_on_the_left(axes_row, row_title, left_border=None)
+ title = self.set_trend_test_reparition_title(subtitle)
+
+ return title
+
+ def set_trend_test_reparition_title(self, subtitle):
# Global information
title = 'Repartition of {} trends'.format(subtitle)
- title += ' at altitude={} for the starting_year={}'.format(self.altitudes[0], self.starting_years[0])
+ title += ' at altitude={}m for the starting_year={}'.format(self.altitudes[0], self.starting_years[0])
plt.suptitle(title)
-
return title
def load_axes_for_trend_test_repartition(self, nb_rows, nb_columns=None):
@@ -288,9 +318,10 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
assert len(axes) == self.nb_rows
results = []
- for subtitle, reduction_function in self.subtitle_to_reduction_function(self.year_reduction,
- add_detailed_plot=add_detailed_plots,
- subtitle=subtitle_specified).items():
+ for idx_reduction, (subtitle, reduction_function) in enumerate(
+ self.subtitle_to_reduction_function(self.year_reduction,
+ add_detailed_plot=add_detailed_plots,
+ subtitle=subtitle_specified).items()):
specific_title, best_year = self.visualize_trend_test_evolution(
reduction_function=reduction_function,
xlabel=STARTING_YEARS_XLABEL,
@@ -298,7 +329,8 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer):
marker=marker,
subtitle=subtitle,
isin_parameters=isin_parameters,
- plot_title=plot_title
+ plot_title=plot_title,
+ idx_reduction=idx_reduction
)
results.append((specific_title, best_year, subtitle))
if show_or_save_to_file:
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_fast_hypercube_one_altitudes.py b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_fast_hypercube_one_altitudes.py
index f44ea7296c9c0a5b63e065c984f0cbddd31af620..8d0bfa7fb9cb07ac3045ee2cce59aba95bd80b40 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_fast_hypercube_one_altitudes.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_fast_hypercube_one_altitudes.py
@@ -59,8 +59,8 @@ def main_percentage_trend_poster_2():
def main_run():
- main_mean_log_likelihood_poster_1()
- # main_percentage_trend_poster_2()
+ # main_mean_log_likelihood_poster_1()
+ main_percentage_trend_poster_2()
if __name__ == '__main__':
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_poster.py b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_poster.py
index f8d5aba90c942ecd080c316cbc6ebc37376acdc4..1c18eba9e3dd5bb00f9539923c4aa83496d7dc14 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_poster.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files/main_poster.py
@@ -14,8 +14,6 @@ from utils import get_display_name_from_object_type
POSTER_ALTITUDES = [900, 1800, 2700]
-
-
def fast_poster():
for altitude in POSTER_ALTITUDES[:1]:
study_classes = SCM_STUDIES[:2]
@@ -49,6 +47,7 @@ def full_poster():
exact_starting_year=exact_year, altitude=altitude)
spatial_visualizer.visualize_massif_trend_test_one_altitude()
+
def example_for_the_starting_years():
for altitude, massif_name, study_class in altitude_massif_name_and_study_class_for_poster[:]:
visualizer = get_full_altitude_visualizer(AltitudeHypercubeVisualizerWithoutTrendExtended, altitude=altitude,
@@ -58,7 +57,6 @@ def example_for_the_starting_years():
subtitle_specified=get_display_name_from_object_type(study_class))
-
if __name__ == '__main__':
- # full_poster()
- example_for_the_starting_years()
+ full_poster()
+ # example_for_the_starting_years()
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
index 199a56265f86a1242c5cf4574ba1c95286b4e6c1..10999fdb733e05fa9e7bd7c3c4727bd5e10eb7c8 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/main_study_visualizer.py
@@ -19,6 +19,7 @@ from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.
from utils import get_display_name_from_object_type
SCM_STUDIES = [SafranSnowfall, CrocusSwe, CrocusDepth]
+SCM_STUDIES_NAMES = [get_display_name_from_object_type(k) for k in SCM_STUDIES]
SCM_STUDY_CLASS_TO_ABBREVIATION = {
SafranSnowfall: 'SF3',
CrocusSwe: 'SWE',