From b4d677303c4313d0acf531212906d36221ccae8b Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 19 Dec 2024 11:31:15 +0000 Subject: [PATCH 1/2] Minor fixes to topadm3 plots --- .../notebooks/reports/active_crisis.ipynb | 6 +++--- .../reports/visualisations/active_crisis/plotting.py | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/{{ cookiecutter.__project_slug }}/notebooks/reports/active_crisis.ipynb b/{{ cookiecutter.__project_slug }}/notebooks/reports/active_crisis.ipynb index 87b769e..373850d 100644 --- a/{{ cookiecutter.__project_slug }}/notebooks/reports/active_crisis.ipynb +++ b/{{ cookiecutter.__project_slug }}/notebooks/reports/active_crisis.ipynb @@ -1458,7 +1458,7 @@ " excess_arrivals_df=regional_dataframe,\n", " arrivals_from_aa=arrivals_from_aa,\n", " key_dates=key_dates,\n", - " aa_name=aa,\n", + " aa_name=excess_arrivals_past_week_w_geo.index_AA.unique().values[0],\n", " output_folder=output_path,\n", " date_string=date_string,\n", " )\n", @@ -1466,10 +1466,10 @@ "\n", "# National level top3 hosts\n", "top_3_adm_hosts_multi_aa_path = top_3_adm_hosts_multi_aa(\n", - " excess_arrivals_df=regional_dataframe,\n", + " excess_arrivals_df=excess_arrivals_past_week_w_geo,\n", " arrivals_from_aa=arrivals_from_aa,\n", " key_dates=key_dates,\n", - " aa_name=list(excess_arrivals_past_week_w_geo.name.unique()),\n", + " aa_name=list(excess_arrivals_past_week_w_geo.index_AA.unique()),\n", " output_folder=output_path,\n", " date_string=date_string,\n", ")\n", diff --git a/{{ cookiecutter.__project_slug }}/notebooks/reports/visualisations/active_crisis/plotting.py b/{{ cookiecutter.__project_slug }}/notebooks/reports/visualisations/active_crisis/plotting.py index a7e1d2e..abd8279 100644 --- a/{{ cookiecutter.__project_slug }}/notebooks/reports/visualisations/active_crisis/plotting.py +++ b/{{ cookiecutter.__project_slug }}/notebooks/reports/visualisations/active_crisis/plotting.py @@ -5,6 +5,7 @@ from pandas import DataFrame import numpy as np from slugify import slugify +from cycler import cycler px = 1 / plt.rcParams["figure.dpi"] @@ -106,6 +107,9 @@ def top_3_adm_hosts( aa_name: str, output_folder: Path, ): + color_cycle_iter = cycler( + color=["#034174", "#CBA45A", "#701F53", "#006E8C", "#BF6799", "#00989A", "#9E6257"] + )() def _plot_arrivals(df, ax): df = df.set_index("date") @@ -206,6 +210,9 @@ def top_3_adm_hosts_multi_aa( aa_name: list[str], output_folder: Path, ): + color_cycle_iter = cycler( + color=["#034174", "#CBA45A", "#701F53", "#006E8C", "#BF6799", "#00989A", "#9E6257"] + )() def _plot_arrivals(df, ax): df = df.groupby("date").sum() From ef59e59137dc292c126c5f45adcbda7fde80f23c Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 19 Dec 2024 11:31:47 +0000 Subject: [PATCH 2/2] Update approval test --- .../notebooks/reports/active_crisis.ipynb | 6 +++--- .../reports/visualisations/active_crisis/plotting.py | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/active_crisis.ipynb b/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/active_crisis.ipynb index 87b769e..373850d 100644 --- a/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/active_crisis.ipynb +++ b/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/active_crisis.ipynb @@ -1458,7 +1458,7 @@ " excess_arrivals_df=regional_dataframe,\n", " arrivals_from_aa=arrivals_from_aa,\n", " key_dates=key_dates,\n", - " aa_name=aa,\n", + " aa_name=excess_arrivals_past_week_w_geo.index_AA.unique().values[0],\n", " output_folder=output_path,\n", " date_string=date_string,\n", " )\n", @@ -1466,10 +1466,10 @@ "\n", "# National level top3 hosts\n", "top_3_adm_hosts_multi_aa_path = top_3_adm_hosts_multi_aa(\n", - " excess_arrivals_df=regional_dataframe,\n", + " excess_arrivals_df=excess_arrivals_past_week_w_geo,\n", " arrivals_from_aa=arrivals_from_aa,\n", " key_dates=key_dates,\n", - " aa_name=list(excess_arrivals_past_week_w_geo.name.unique()),\n", + " aa_name=list(excess_arrivals_past_week_w_geo.index_AA.unique()),\n", " output_folder=output_path,\n", " date_string=date_string,\n", ")\n", diff --git a/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/visualisations/active_crisis/plotting.py b/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/visualisations/active_crisis/plotting.py index a7e1d2e..abd8279 100644 --- a/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/visualisations/active_crisis/plotting.py +++ b/.circleci/approved/npl-approvalstest-2016-01-01/notebooks/reports/visualisations/active_crisis/plotting.py @@ -5,6 +5,7 @@ from pandas import DataFrame import numpy as np from slugify import slugify +from cycler import cycler px = 1 / plt.rcParams["figure.dpi"] @@ -106,6 +107,9 @@ def top_3_adm_hosts( aa_name: str, output_folder: Path, ): + color_cycle_iter = cycler( + color=["#034174", "#CBA45A", "#701F53", "#006E8C", "#BF6799", "#00989A", "#9E6257"] + )() def _plot_arrivals(df, ax): df = df.set_index("date") @@ -206,6 +210,9 @@ def top_3_adm_hosts_multi_aa( aa_name: list[str], output_folder: Path, ): + color_cycle_iter = cycler( + color=["#034174", "#CBA45A", "#701F53", "#006E8C", "#BF6799", "#00989A", "#9E6257"] + )() def _plot_arrivals(df, ax): df = df.groupby("date").sum()