refactoring

This commit is contained in:
frankknoll
2022-02-21 13:20:57 +01:00
parent ebc58be5d9
commit bd62fceb27

View File

@@ -158,18 +158,8 @@
"class SummationTableFactory:\n", "class SummationTableFactory:\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def createSummationTable(\n", " def createSummationTableHavingSevereReportsColumn(dataFrame):\n",
" groupBy,\n", " summationTable = dataFrame.agg({\n",
" columnNameMappingsDict = {\n",
" \"DIED_size\": \"Adverse Reaction Reports\",\n",
" \"DIED_sum\": \"Deaths\",\n",
" \"L_THREAT_sum\": \"Life Threatening Illnesses\",\n",
" \"DISABLE_sum\": \"Disabilities\",\n",
" 'HOSPITAL_sum': 'Hospitalisations',\n",
" 'ER_VISIT_sum': 'Emergency Room or Doctor Visits'\n",
" }):\n",
"\n",
" summationTable = groupBy.agg({\n",
" 'DIED': ['sum', 'size'],\n", " 'DIED': ['sum', 'size'],\n",
" 'L_THREAT': 'sum',\n", " 'L_THREAT': 'sum',\n",
" 'DISABLE': 'sum',\n", " 'DISABLE': 'sum',\n",
@@ -178,13 +168,7 @@
" 'SEVERE': 'sum'\n", " 'SEVERE': 'sum'\n",
" })\n", " })\n",
" SummationTableFactory._flattenColumns(summationTable)\n", " SummationTableFactory._flattenColumns(summationTable)\n",
" return summationTable.rename(columns = columnNameMappingsDict)\n", " summationTable = summationTable.rename(columns = {\n",
"\n",
" @staticmethod\n",
" def createSummationTableHavingSevereReportsColumn(dataFrame):\n",
" summationTable = SummationTableFactory.createSummationTable(\n",
" dataFrame,\n",
" columnNameMappingsDict = {\n",
" \"DIED_size\": \"Adverse Reaction Reports\",\n", " \"DIED_size\": \"Adverse Reaction Reports\",\n",
" \"DIED_sum\": \"Deaths\",\n", " \"DIED_sum\": \"Deaths\",\n",
" \"L_THREAT_sum\": \"Life Threatening Illnesses\",\n", " \"L_THREAT_sum\": \"Life Threatening Illnesses\",\n",
@@ -362,8 +346,8 @@
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def saveDataFrame(dataFrame, file):\n", " def saveDataFrame(dataFrame, file):\n",
" IOUtils.saveDataFrameAsExcelFile(dataFrame, file)\n", " # IOUtils.saveDataFrameAsExcelFile(dataFrame, file)\n",
" IOUtils.saveDataFrameAsHtml(dataFrame, file)\n", " # IOUtils.saveDataFrameAsHtml(dataFrame, file)\n",
" IOUtils.saveDataFrameAsJson(dataFrame, file)\n", " IOUtils.saveDataFrameAsJson(dataFrame, file)\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",