Plot styling.

covid-19-impact-lab · Jan 18, 2021 · d271559 · d271559
1 parent c991457
commit d271559
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/simulation/task_plot_additional_work_from_home_simulations.py b/src/simulation/task_plot_additional_work_from_home_simulations.py
@@ -172,7 +172,7 @@ def plot_incidences(incidences, n_single_runs, title):
     ax.set_ylabel("Geglättete wöchentliche \nNeuinfektionen pro 100 000")
     ax.grid(axis="y")
     ax.set_title(title)
-    ax.legend(loc="upper center", bbox_to_anchor=(-0.1, -0.5, 1, 0.2))
+    ax.legend(loc="upper center", bbox_to_anchor=(-0.0, -0.5, 1, 0.2))
     fig.tight_layout()
 
     return fig, ax
diff --git a/src/simulation/task_plot_future_work_from_home_simulations.py b/src/simulation/task_plot_future_work_from_home_simulations.py
@@ -1,8 +1,10 @@
 import dask.dataframe as dd
 import matplotlib.pyplot as plt
+import pandas as pd
 import pytask
 
 from src.config import BLD
+from src.config import SRC
 from src.simulation.task_plot_additional_work_from_home_simulations import (
     plot_incidences,
 )
@@ -79,7 +81,10 @@
 ]
 
 
-@pytask.mark.depends_on(WFH_FUTURE_SIMULATION_PATHS)
+@pytask.mark.depends_on(
+    WFH_FUTURE_SIMULATION_PATHS
+    + [SRC / "simulation" / "task_plot_additional_work_from_home_simulations.py"]
+)
 @pytask.mark.parametrize("outcome, title, produces", WFH_PLOT_PARAMETRIZATION)
 def task_plot_work_from_home_schools_open_future_simulations(
     depends_on, outcome, title, produces
@@ -98,4 +103,8 @@ def task_plot_work_from_home_schools_open_future_simulations(
         incidences[name] = time_series_df
 
     fig, ax = plot_incidences(incidences, 15, title)
+    if title == "Beobachtete Inzidenz":
+        ax.set_ylim(0, 180)
+    ax.set_xlim(pd.Timestamp("2021-01-04"), pd.Timestamp("2021-03-02"))
+    ax.set_xlabel("")
     fig.savefig(produces["fig"], dpi=200, transparent=False, facecolor="w")
diff --git a/src/simulation/task_plot_future_work_from_home_simulations_schools_closed.py b/src/simulation/task_plot_future_work_from_home_simulations_schools_closed.py
@@ -1,17 +1,16 @@
 import dask.dataframe as dd
 import matplotlib.pyplot as plt
+import pandas as pd
 import pytask
 
 from src.config import BLD
+from src.config import SRC
 from src.simulation.task_plot_additional_work_from_home_simulations import (
     plot_incidences,
 )
 from src.simulation.task_plot_additional_work_from_home_simulations import (
     weekly_incidences_from_results,
 )
-from src.simulation.task_simulate_additional_work_from_home_future_schools_closed import (  # noqa: E501
-    FUTURE_WFH_SCENARIO_NAMES,
-)
 from src.simulation.task_simulate_additional_work_from_home_future_schools_closed import (  # noqa: E501
     FUTURE_WFH_SEEDS,
 )
@@ -26,6 +25,12 @@
 )
 
 
+FUTURE_WFH_SCENARIO_NAMES = [
+    "mobility_data_baseline",
+    "1st_lockdown_strict",
+    "full_potential",
+]
+
 WFH_FUTURE_SIMULATION_PATHS = [
     BLD
     / "simulations"
@@ -79,7 +84,10 @@
 ]
 
 
-@pytask.mark.depends_on(WFH_FUTURE_SIMULATION_PATHS)
+@pytask.mark.depends_on(
+    WFH_FUTURE_SIMULATION_PATHS
+    + [SRC / "simulation" / "task_plot_additional_work_from_home_simulations.py"]
+)
 @pytask.mark.parametrize("outcome, title, produces", WFH_PLOT_PARAMETRIZATION)
 def task_plot_work_from_home_schools_closed_future_simulations(
     depends_on, outcome, title, produces
@@ -98,4 +106,9 @@ def task_plot_work_from_home_schools_closed_future_simulations(
         incidences[name] = time_series_df
 
     fig, ax = plot_incidences(incidences, 15, title)
+    if title == "Beobachtete Inzidenz":
+        ax.set_ylim(0, 200)
+    ax.set_xlim(pd.Timestamp("2021-01-04"), pd.Timestamp("2021-03-02"))
+    ax.set_xlabel("")
+
     fig.savefig(produces["fig"], dpi=200, transparent=False, facecolor="w")