From b65db5e599069aa25a85d6bb9aeea799bd6084cf Mon Sep 17 00:00:00 2001 From: Le Roux Erwan <erwan.le-roux@irstea.fr> Date: Wed, 5 Jun 2019 16:49:13 +0200 Subject: [PATCH] [STATIONS] modify sheetname used for comparisons --- .../stations_data/comparison_analysis.py | 3 ++- .../stations_data/main_spatial_comparison.py | 10 +++++++++- .../stations_data/main_station_comparison.py | 4 ++-- .../comparisons_visualization.py | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/experiment/meteo_france_data/stations_data/comparison_analysis.py b/experiment/meteo_france_data/stations_data/comparison_analysis.py index 2dc6b0e5..4a4480ae 100644 --- a/experiment/meteo_france_data/stations_data/comparison_analysis.py +++ b/experiment/meteo_france_data/stations_data/comparison_analysis.py @@ -51,7 +51,8 @@ class ComparisonAnalysis(object): ##################### STATION ATTRIBUTES ############################ def load_main_df(self): - df = pd.read_excel(DATA_PATH, sheet_name='max alpes 2500m presentes') + # this sheet name: Mean metrics 24.666666666666668 for the sheet name it was worse Mean metrics 36.022222222222226 + df = pd.read_excel(DATA_PATH, sheet_name='max alpes') df = df.iloc[:78] ind_altitude = self.altitude - self.margin < df[ALTITUDE_COLUMN_NAME] diff --git a/experiment/meteo_france_data/stations_data/main_spatial_comparison.py b/experiment/meteo_france_data/stations_data/main_spatial_comparison.py index c3b50c4c..592c4750 100644 --- a/experiment/meteo_france_data/stations_data/main_spatial_comparison.py +++ b/experiment/meteo_france_data/stations_data/main_spatial_comparison.py @@ -66,6 +66,14 @@ I should find the "optimal" years to remove Then I should find a way to remove the same years in the study """ +def test_data(): + s = ComparisonAnalysis(altitude=900) + df = s.load_main_df() + print(df) + print(df.columns) + print(len(df)) + if __name__ == '__main__': - run_comparison_for_optimal_parameters_for_altitude_900() + test_data() + # run_comparison_for_optimal_parameters_for_altitude_900() # choice_of_altitude_and_nb_border_data_to_remove_to_get_data_without_nan() diff --git a/experiment/meteo_france_data/stations_data/main_station_comparison.py b/experiment/meteo_france_data/stations_data/main_station_comparison.py index 7fd8950c..1c116335 100644 --- a/experiment/meteo_france_data/stations_data/main_station_comparison.py +++ b/experiment/meteo_france_data/stations_data/main_station_comparison.py @@ -44,8 +44,8 @@ def wrong_example2(): if __name__ == '__main__': # visualize_fast_comparison() - # visualize_all_stations() - wrong_example2() + visualize_all_stations() + # wrong_example2() # visualize_non_nan_station() # example() diff --git a/experiment/meteo_france_data/stations_data/visualization/comparisons_visualization/comparisons_visualization.py b/experiment/meteo_france_data/stations_data/visualization/comparisons_visualization/comparisons_visualization.py index 9d62fe0f..b2ecedd9 100644 --- a/experiment/meteo_france_data/stations_data/visualization/comparisons_visualization/comparisons_visualization.py +++ b/experiment/meteo_france_data/stations_data/visualization/comparisons_visualization/comparisons_visualization.py @@ -67,6 +67,7 @@ class ComparisonsVisualization(VisualizationParameters): massif_and_altitude_and_metric.append((massif, c.altitude, metric)) ax_idx += 1 metrics = [t[-1] for t in massif_and_altitude_and_metric] + print('Mean metrics', np.mean(metrics)) print('max', [t for t in massif_and_altitude_and_metric if t[-1] == max(metrics)]) print('min', [t for t in massif_and_altitude_and_metric if t[-1] == min(metrics)]) plt.suptitle(title) -- GitLab