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 09:49:48 +01:00
parent 55af50cb0f
commit fa55ac1da4
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
HowBadIsMyBatch.ipynb
View File

@@ -261,20 +261,18 @@
" \n", " \n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseTable(dataFrame):\n", " def getDoseTable(dataFrame):\n",
" filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" filteredDataFrame.groupby(\n", " dataFrame.groupby(\n",
" filteredDataFrame['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",
" filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" filteredDataFrame.groupby(\n", " dataFrame.groupby(\n",
" [\n", " [\n",
" filteredDataFrame['RECVDATE'].dt.year.rename('Year'),\n", " dataFrame['RECVDATE'].dt.year.rename('Year'),\n",
" filteredDataFrame['RECVDATE'].dt.month.rename('Month'),\n", " dataFrame['RECVDATE'].dt.month.rename('Month'),\n",
" filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n",
" ]))\n", " ]))\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
@@ -623,6 +621,7 @@
" \"1048786\",\n", " \"1048786\",\n",
" \"4711\"],\n", " \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" \n", " \n",
" # When\n", " # When\n",
" doseTable = DoseAnalysis.getDoseTable(dataFrame)\n", " doseTable = DoseAnalysis.getDoseTable(dataFrame)\n",
@@ -653,6 +652,7 @@
" \"1048786\",\n", " \"1048786\",\n",
" \"4711\"],\n", " \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" \n", " \n",
" # When\n", " # When\n",
" doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n", " doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n",
@@ -815,11 +815,13 @@
"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(dataFrame).filterByCovid19And()\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(dataFrame).filterByCovid19And()\n",
" return DoseAnalysis.getDoseByMonthTable(dataFrame)" " return DoseAnalysis.getDoseByMonthTable(dataFrame)"
] ]
}, },