Commit e96fff75 authored by Le Roux Erwan's avatar Le Roux Erwan
Browse files

[PAPER 1] fix issue when ploting eurocode

parent 554e023e
No related merge requests found
Showing with 12 additions and 8 deletions
+12 -8
...@@ -341,7 +341,7 @@ class AbstractStudy(object): ...@@ -341,7 +341,7 @@ class AbstractStudy(object):
# Potentially, fill the inside of the polygon with some color # Potentially, fill the inside of the polygon with some color
if fill and coordinate_id in cls.coordinate_id_to_massif_name: if fill and coordinate_id in cls.coordinate_id_to_massif_name:
massif_name = cls.coordinate_id_to_massif_name[coordinate_id] massif_name = cls.coordinate_id_to_massif_name[coordinate_id]
if massif_name in massif_name_to_marker_style: if massif_name_to_marker_style is not None and massif_name in massif_name_to_marker_style:
massif_coordinate = masssif_coordinate_for_display.df_all_coordinates.loc[massif_name, :].values massif_coordinate = masssif_coordinate_for_display.df_all_coordinates.loc[massif_name, :].values
if massif_name in ['Maurienne', 'Mercantour']: if massif_name in ['Maurienne', 'Mercantour']:
massif_coordinate[1] -= 5000 massif_coordinate[1] -= 5000
......
...@@ -31,7 +31,7 @@ and the for the 3 variables considered: GSL, GSL from eurocode, GLS in 3 days ...@@ -31,7 +31,7 @@ and the for the 3 variables considered: GSL, GSL from eurocode, GLS in 3 days
""" """
if __name__ == '__main__': if __name__ == '__main__':
for half_mcmc_iterations in [10000, 50000, 100000, 1000000][-1:]: for half_mcmc_iterations in [500000][:]:
for study_class in paper_study_classes[:1]: for study_class in paper_study_classes[:1]:
study_name = get_display_name_from_object_type(study_class) study_name = get_display_name_from_object_type(study_class)
print(study_name, half_mcmc_iterations) print(study_name, half_mcmc_iterations)
......
...@@ -17,7 +17,8 @@ def main_eurocode_norms(ax=None): ...@@ -17,7 +17,8 @@ def main_eurocode_norms(ax=None):
altitudes = np.linspace(200, 2000) altitudes = np.linspace(200, 2000)
for region_class in [C1, C2, E][:]: for region_class in [C1, C2, E][:]:
region_object = region_class() region_object = region_class()
label = get_display_name_from_object_type(region_class) + ' Eurocodes region' space = ' ' if region_class == E else ' '
label = get_display_name_from_object_type(region_class) + space + 'region'
linestyle = '--' if region_class == C2 else '-' linestyle = '--' if region_class == C2 else '-'
region_object.plot_eurocode_snow_load_on_ground_characteristic_value_variable_action(ax, altitudes, label=label, linestyle=linestyle) region_object.plot_eurocode_snow_load_on_ground_characteristic_value_variable_action(ax, altitudes, label=label, linestyle=linestyle)
if region_class == E: if region_class == E:
...@@ -43,9 +44,10 @@ def main_eurocode_map(ax=None): ...@@ -43,9 +44,10 @@ def main_eurocode_map(ax=None):
if ax is None: if ax is None:
ax = plt.gca() ax = plt.gca()
massif_name_to_color = {m: r.eurocode_color for m, r in massif_name_to_eurocode_region.items()} massif_name_to_color = {m: r.eurocode_color for m, r in massif_name_to_eurocode_region.items()}
AbstractStudy.visualize_study(ax, massif_name_to_color=massif_name_to_color, scaled=True) AbstractStudy.visualize_study(ax, massif_name_to_color=massif_name_to_color, scaled=True,
axis_off=True)
if __name__ == '__main__': if __name__ == '__main__':
main_eurocode_norms() # main_eurocode_norms()
# main_eurocode_map() main_eurocode_map()
import matplotlib as mpl import matplotlib as mpl
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from experiment.paper_past_snow_loads.paper_utils import paper_study_classes, paper_altitudes from experiment.paper_past_snow_loads.paper_utils import paper_study_classes, paper_altitudes, \
load_altitude_to_visualizer
from experiment.paper_past_snow_loads.result_trends_and_return_levels.eurocode_visualizer import \ from experiment.paper_past_snow_loads.result_trends_and_return_levels.eurocode_visualizer import \
plot_uncertainty_massifs plot_uncertainty_massifs
from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from experiment.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal
...@@ -58,7 +59,8 @@ def major_result(): ...@@ -58,7 +59,8 @@ def major_result():
if __name__ == '__main__': if __name__ == '__main__':
major_result() major_result()
# minor_result(altitude=1800) # intermediate_result(paper_altitudes)
# minor_result(altitude=600)
# intermediate_result(altitudes=[1500, 1800], massif_names=['Chartreuse'], # intermediate_result(altitudes=[1500, 1800], massif_names=['Chartreuse'],
# uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle, # uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle,
# ConfidenceIntervalMethodFromExtremes.ci_bayes], # ConfidenceIntervalMethodFromExtremes.ci_bayes],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment