From bd62fceb276ddcf7eb24b1157bb0aa076d26f414 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Mon, 21 Feb 2022 13:20:57 +0100 Subject: [PATCH] refactoring --- src/HowBadIsMyBatch.ipynb | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 0910e44a664..1beadebd3c2 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -158,18 +158,8 @@ "class SummationTableFactory:\n", "\n", " @staticmethod\n", - " def createSummationTable(\n", - " groupBy,\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", + " def createSummationTableHavingSevereReportsColumn(dataFrame):\n", + " summationTable = dataFrame.agg({\n", " 'DIED': ['sum', 'size'],\n", " 'L_THREAT': 'sum',\n", " 'DISABLE': 'sum',\n", @@ -178,13 +168,7 @@ " 'SEVERE': 'sum'\n", " })\n", " SummationTableFactory._flattenColumns(summationTable)\n", - " return summationTable.rename(columns = columnNameMappingsDict)\n", - "\n", - " @staticmethod\n", - " def createSummationTableHavingSevereReportsColumn(dataFrame):\n", - " summationTable = SummationTableFactory.createSummationTable(\n", - " dataFrame,\n", - " columnNameMappingsDict = {\n", + " summationTable = summationTable.rename(columns = {\n", " \"DIED_size\": \"Adverse Reaction Reports\",\n", " \"DIED_sum\": \"Deaths\",\n", " \"L_THREAT_sum\": \"Life Threatening Illnesses\",\n", @@ -362,8 +346,8 @@ "\n", " @staticmethod\n", " def saveDataFrame(dataFrame, file):\n", - " IOUtils.saveDataFrameAsExcelFile(dataFrame, file)\n", - " IOUtils.saveDataFrameAsHtml(dataFrame, file)\n", + " # IOUtils.saveDataFrameAsExcelFile(dataFrame, file)\n", + " # IOUtils.saveDataFrameAsHtml(dataFrame, file)\n", " IOUtils.saveDataFrameAsJson(dataFrame, file)\n", "\n", " @staticmethod\n",