refactoring
This commit is contained in:
@@ -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)"
|
||||
]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user