From 4377a8e40c9c0742ec68f96b7abb1cfacc65803b Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sun, 6 Feb 2022 11:38:05 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index e2b1a226229..2428b05e0b9 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -260,12 +260,14 @@ " \n", " @staticmethod\n", " def getDoseTable(dataFrame):\n", + " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " return DoseAnalysis._getDoseTable(\n", " dataFrame.groupby(\n", " dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", "\n", " @staticmethod\n", " def getDoseByMonthTable(dataFrame):\n", + " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " return DoseAnalysis._getDoseTable(\n", " dataFrame.groupby(\n", " [\n", @@ -624,7 +626,6 @@ " \"1048786\",\n", " \"4711\"],\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", - " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " \n", " # When\n", " doseTable = DoseAnalysis.getDoseTable(dataFrame)\n", @@ -655,7 +656,6 @@ " \"1048786\",\n", " \"4711\"],\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", - " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " \n", " # When\n", " doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n", @@ -818,13 +818,11 @@ "def getDoseTable():\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " return DoseAnalysis.getDoseTable(dataFrame)\n", "\n", "def getDoseByMonthTable():\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " return DoseAnalysis.getDoseByMonthTable(dataFrame)" ] },