francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-02-06 11:38:05 +01:00
parent 4ba08fcf1d
commit 4377a8e40c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HowBadIsMyBatch.ipynb
View File

@@ -260,12 +260,14 @@
" \n", " \n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseTable(dataFrame):\n", " def getDoseTable(dataFrame):\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" dataFrame.groupby(\n", " dataFrame.groupby(\n",
" dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", " dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseByMonthTable(dataFrame):\n", " def getDoseByMonthTable(dataFrame):\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" dataFrame.groupby(\n", " dataFrame.groupby(\n",
" [\n", " [\n",
@@ -624,7 +626,6 @@
" \"1048786\",\n", " \"1048786\",\n",
" \"4711\"],\n", " \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" \n", " \n",
" # When\n", " # When\n",
" doseTable = DoseAnalysis.getDoseTable(dataFrame)\n", " doseTable = DoseAnalysis.getDoseTable(dataFrame)\n",
@@ -655,7 +656,6 @@
" \"1048786\",\n", " \"1048786\",\n",
" \"4711\"],\n", " \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" \n", " \n",
" # When\n", " # When\n",
" doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n", " doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n",
@@ -818,13 +818,11 @@
"def getDoseTable():\n", "def getDoseTable():\n",
" vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis.getDoseTable(dataFrame)\n", " return DoseAnalysis.getDoseTable(dataFrame)\n",
"\n", "\n",
"def getDoseByMonthTable():\n", "def getDoseByMonthTable():\n",
" vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n", " vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis.getDoseByMonthTable(dataFrame)" " return DoseAnalysis.getDoseByMonthTable(dataFrame)"
] ]
}, },