diff --git a/scenario/run.py b/scenario/run.py index b6e400e..3dde7c1 100644 --- a/scenario/run.py +++ b/scenario/run.py @@ -65,6 +65,6 @@ stats_result = launch_parallel_byvariant(params, env_dic, scenario_variant_dic[params[scenario_id_key]], params[ncpu_key]) else: - sys.exit(0) + raise KeyError("Unknown scenario") print("It took : %.2f seconds" % (time.time() - t_start)) chose_draw_plot(params[draw_graph_key], stats_result, params[show_plot_key]) diff --git a/simulator/helper/parser.py b/simulator/helper/parser.py index 0087fc4..17c7eaf 100644 --- a/simulator/helper/parser.py +++ b/simulator/helper/parser.py @@ -39,7 +39,7 @@ def get_parser(): parser.add_argument('--death-bounds', type=int, nargs=2, help='Death bounds', dest=death_bounds_key) parser.add_argument('--immunity-bounds', type=int, nargs=2, help='Immunity bounds', dest=immunity_bounds_key) - parser.add_argument('--nbeds-icu', type=int, help='Number of ICU beds per thousand population', + parser.add_argument('--nbeds-icu', type=float, help='Number of ICU beds per thousand population', dest=icu_bed_per_thousand_individual_key) parser.add_argument('--scenario-id', "--sce", type=int, help='Immunity bounds', dest=scenario_id_key) diff --git a/simulator/helper/plot.py b/simulator/helper/plot.py index 5c05a81..6c195c8 100644 --- a/simulator/helper/plot.py +++ b/simulator/helper/plot.py @@ -50,7 +50,6 @@ def draw_new_daily_cases(stats_arg, show_plot, x_tick=10): def draw_meta_simulation(death_stat_arg, show_plot): fig, ax = plt.subplots(figsize=(15, 10)) set_ax_meta_simulation(ax, death_stat_arg) - print("ok") if show_plot: plt.show() else: