From fa55ac1da4ee7840ca75a127baf360fcaa140816 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sun, 6 Feb 2022 09:49:48 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 4fce092c656..c5ef1d9f13a 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -261,20 +261,18 @@ " \n", " @staticmethod\n", " def getDoseTable(dataFrame):\n", - " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis._getDoseTable(\n", - " filteredDataFrame.groupby(\n", - " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", + " dataFrame.groupby(\n", + " dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", "\n", " @staticmethod\n", " def getDoseByMonthTable(dataFrame):\n", - " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis._getDoseTable(\n", - " filteredDataFrame.groupby(\n", + " dataFrame.groupby(\n", " [\n", - " filteredDataFrame['RECVDATE'].dt.year.rename('Year'),\n", - " filteredDataFrame['RECVDATE'].dt.month.rename('Month'),\n", - " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", + " dataFrame['RECVDATE'].dt.year.rename('Year'),\n", + " dataFrame['RECVDATE'].dt.month.rename('Month'),\n", + " dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " ]))\n", "\n", " @staticmethod\n", @@ -623,6 +621,7 @@ " \"1048786\",\n", " \"4711\"],\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", + " dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " \n", " # When\n", " doseTable = DoseAnalysis.getDoseTable(dataFrame)\n", @@ -653,6 +652,7 @@ " \"1048786\",\n", " \"4711\"],\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", + " dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " \n", " # When\n", " doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n", @@ -815,11 +815,13 @@ "def getDoseTable():\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis.getDoseTable(dataFrame)\n", "\n", "def getDoseByMonthTable():\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis.getDoseByMonthTable(dataFrame)" ] },