diff --git a/source/visualizations/plots_for_paper.py b/source/visualizations/plots_for_paper.py index bedc679880d8d43797dee9303b03e31d10a92a75..1ef6c310218e0d33fd2d1afd47114aa4a2c8a7e5 100644 --- a/source/visualizations/plots_for_paper.py +++ b/source/visualizations/plots_for_paper.py @@ -399,6 +399,12 @@ def time_series(gap_id=None): 'file_with_cs': 'SpatialMean_cs_predictions_useval.pyt', 'color': 'steelblue' } + numerical_model_dict = { + 'model_name': 'Numerical model', + 'file_without_cs': 'cams_predictions_useval.pt', + 'file_with_cs': 'Cams_cs_predictions_useval.pyt', + 'color': 'steelblue' + } nearest_neighbor_hybrid_dict = { 'model_name': 'Nearest neighbor hybrid', 'file_without_cs': 'nearestneighborhybrid_predictions_useval.pt', @@ -412,6 +418,7 @@ def time_series(gap_id=None): 'color': 'steelblue' } dicts = [spatiotemporal_mean_dict, spatial_mean_dict, + numerical_model_dict, nearest_neighbor_hybrid_dict, random_forest_dict] model_path = settings.resources_dir + 'models/' for dict_ in dicts: @@ -421,7 +428,7 @@ def time_series(gap_id=None): dict_['data_with_cs'] = data_with_cs.numpy().reshape(-1) # setting up plot - fig, axes = plt.subplots(4, 1, figsize=(10, 7), sharex=True) + fig, axes = plt.subplots(5, 1, figsize=(12.5, 7), sharex=True) for model_idx, ax in enumerate(axes): dict_ = dicts[model_idx] ax.fill_between(range(start_idx, gap_start_idx+1), @@ -890,14 +897,9 @@ def modeled_time_series(): if __name__ == '__main__': station_loc_on_map_ = False station_ids_on_map_ = False -<<<<<<< HEAD - o3_value_matrix_ = True - mask_matrix_ = False -======= o3_value_matrix_ = False - mask_matrix_ = True ->>>>>>> clara_issue36_cross_validation_second_try - time_series_ = False + mask_matrix_ = False + time_series_ = True basic_statistics_and_histogram_ = False exceedances_ = False true_vs_imputed_ = False