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 4cf99e10621f1c8690a40f405f9ade0ebe139dae..df09b2edd69285c88e774b904929c99522fa75da 100644 --- a/experiment/meteo_france_data/scm_models_data/abstract_study.py +++ b/experiment/meteo_france_data/scm_models_data/abstract_study.py @@ -228,7 +228,7 @@ class AbstractStudy(object): def visualize_study(cls, ax=None, massif_name_to_value: Union[None, Dict[str, float]] = None, show=True, fill=True, replace_blue_by_white=True, label=None, add_text=False, cmap=None, vmax=100, vmin=0, - default_color_for_missing_massif='w', + default_color_for_missing_massif='grey', default_color_for_nan_values='w', massif_name_to_color=None, show_label=True, 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 54c559260bb118eadc5139dcdf5bbeada4c4087b..55b1c08d4dc7c8756d463a057d8714601fc82909 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 @@ -282,10 +282,12 @@ class AltitudeHypercubeVisualizer(AbstractHypercubeVisualizer): massif_to_year = {} poster_trend_types = [AbstractUnivariateTest.SIGNIFICATIVE_POSITIVE_TREND, AbstractUnivariateTest.SIGNIFICATIVE_NEGATIVE_TREND, - AbstractUnivariateTest.NON_SIGNIFICATIVE_TREND][:2] + AbstractUnivariateTest.NEGATIVE_TREND, + AbstractUnivariateTest.POSITIVE_TREND, + ][:] for display_trend_type, style in self.display_trend_type_to_style.items(): if display_trend_type in poster_trend_types: - color = style[:1] + color = style[:-1] serie = trend_type_to_serie[display_trend_type] massif_to_color_for_trend_type = {k: color for k, v in dict(serie).items() if not np.isnan(v)} massif_to_color.update(massif_to_color_for_trend_type) diff --git a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files_after_conf/main_starting_years.py b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files_after_conf/main_starting_years.py index 2125580e5c59757099976fff3485787a1074768f..4ac6423cce980ed8e5b376d8888c2eac37d58ab3 100644 --- a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files_after_conf/main_starting_years.py +++ b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/main_files_after_conf/main_starting_years.py @@ -30,7 +30,7 @@ def get_fast_altitude_visualizer(altitude_hypercube_class): return visualizer -def main_fast_spatial_repartition(): +def main_fast_old_spatial_repartition(): # Simply the main graph get_fast_altitude_visualizer(Altitude_Hypercube_Year_Visualizer).visualize_massif_trend_test_one_altitude() @@ -51,19 +51,27 @@ def get_full_altitude_visualizer(altitude_hypercube_class, exact_starting_year=N FULL_ALTITUDES = [900, 1500, 2100, 2700] +def main_fast_spatial_repartition(): + for altitude in FULL_ALTITUDES[-1:]: + vizualiser = get_full_altitude_visualizer(Altitude_Hypercube_Year_Visualizer, altitude=altitude, + exact_starting_year=1958) + vizualiser.visualize_massif_trend_test_one_altitude() + + def main_full_spatial_repartition(): for altitude in FULL_ALTITUDES[:]: # Compute for the most likely starting year vizualiser = get_full_altitude_visualizer(Altitude_Hypercube_Year_Visualizer, altitude=altitude) vizualiser.visualize_massif_trend_test_one_altitude() # Compute the trend for a linear trend - vizualiser = get_full_altitude_visualizer(Altitude_Hypercube_Year_Visualizer, altitude=altitude, exact_starting_year=1958) + vizualiser = get_full_altitude_visualizer(Altitude_Hypercube_Year_Visualizer, altitude=altitude, + exact_starting_year=1958) vizualiser.visualize_massif_trend_test_one_altitude() def main_run(): - main_full_spatial_repartition() - # main_fast_spatial_repartition() + # main_full_spatial_repartition() + main_fast_spatial_repartition() if __name__ == '__main__': diff --git a/experiment/trend_analysis/univariate_test/abstract_univariate_test.py b/experiment/trend_analysis/univariate_test/abstract_univariate_test.py index e0b1e3ecb35a35b2daf6fbacb0efec973094a591..52863f9801d9fa2269b38dff9e2287db1472f913 100644 --- a/experiment/trend_analysis/univariate_test/abstract_univariate_test.py +++ b/experiment/trend_analysis/univariate_test/abstract_univariate_test.py @@ -56,8 +56,8 @@ class AbstractUnivariateTest(object): @classmethod def display_trend_type_to_style(cls): d = OrderedDict() - # d[cls.POSITIVE_TREND] = 'g--' - # d[cls.NEGATIVE_TREND] = 'r--' + d[cls.POSITIVE_TREND] = 'lightgreen-' + d[cls.NEGATIVE_TREND] = 'lightcoral-' d[cls.ALL_TREND] = 'k-' d[cls.NON_SIGNIFICATIVE_TREND] = 'b-' # d[cls.SIGNIFICATIVE_ALL_TREND] = 'k-' @@ -66,6 +66,7 @@ class AbstractUnivariateTest(object): # d[cls.NO_TREND] = 'k--' return d + @classmethod def get_display_trend_type(cls, real_trend_type): if cls.SIGNIFICATIVE in real_trend_type: