From b812b6fc0bb99e82f6d38907e2cbc0e6b804cc07 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Mon, 31 Jan 2022 21:38:06 +0100
Subject: [PATCH] refactoring

---
 HowBadIsMyBatch.ipynb | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb
index 31b1c4111c4..7865431572d 100644
--- a/HowBadIsMyBatch.ipynb
+++ b/HowBadIsMyBatch.ipynb
@@ -85,14 +85,12 @@
     "    isDose = df[\"VAX_DOSE_SERIES\"].str.contains(dose) if dose is not None else True\n",
     "    return df[isCovid19 & isManufacturer & isDose]\n",
     "\n",
+    "# FK-TODO: inline method\n",
     "def createAndFilterDataFrameFromDescrs(vaersDescrs, manufacturer, dose):\n",
     "    return filterDataFrame(createDataFrameFromDescrs(vaersDescrs), manufacturer = manufacturer, dose = dose)\n",
     "\n",
     "def filterDataFrameForSevereEffects(df, dose):\n",
-    "    return filterDataFrame(df, dose = dose)\n",
-    "\n",
-    "def createDataFrameSevereEffectsFromDescrs(vaersDescrs, dose):\n",
-    "    return filterDataFrameForSevereEffects(createDataFrameFromDescrs(vaersDescrs), dose = dose)"
+    "    return filterDataFrame(df, dose = dose)\n"
    ]
   },
   {
@@ -102,11 +100,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# FK-TODO: inline method\n",
     "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n",
-    "    return createAndFilterDataFrameFromDescrs(readAllVaersDescrs(dataDir), manufacturer, dose)\n",
-    "\n",
-    "def createDataFrameSevereEffectsFromFiles(dataDir, dose):\n",
-    "    return createDataFrameSevereEffectsFromDescrs(readAllVaersDescrs(dataDir), dose)"
+    "    return createAndFilterDataFrameFromDescrs(readAllVaersDescrs(dataDir), manufacturer, dose)\n"
    ]
   },
   {
@@ -258,9 +254,10 @@
     "                       dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
     "               }\n",
     "            ]\n",
-    "            \n",
+    "        dataFrame = createDataFrameFromDescrs(vaersDescrs)\n",
+    "        \n",
     "        # When\n",
-    "        dataFrame = createDataFrameSevereEffectsFromDescrs(vaersDescrs, '1')\n",
+    "        dataFrame = filterDataFrameForSevereEffects(dataFrame, dose = '1')\n",
     "        \n",
     "        # Then\n",
     "        dataFrameExpected = self.createDataFrame(\n",
@@ -429,7 +426,8 @@
     "class SevereEffectsBatchCodeTableTest(unittest.TestCase):\n",
     "\n",
     "    def test_createSevereEffectsBatchCodeTable(self):\n",
-    "        dataFrame = createDataFrameSevereEffectsFromDescrs(\n",
+    "        # Given\n",
+    "        dataFrame = createDataFrameFromDescrs(\n",
     "            [\n",
     "               {\n",
     "                   'VAERSDATA': self.createDataFrame(\n",
@@ -448,8 +446,9 @@
     "                           \"0916601\"],\n",
     "                       dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
     "               }\n",
-    "            ],\n",
-    "            '1')\n",
+    "            ]\n",
+    "        )\n",
+    "        dataFrame = filterDataFrameForSevereEffects(dataFrame, dose = '1')\n",
     "\n",
     "        # When\n",
     "        batchCodeTable = createSevereEffectsBatchCodeTable(dataFrame)\n",
@@ -515,7 +514,11 @@
    "outputs": [],
    "source": [
     "def saveSevereEffectsBatchCodeTable(excelFile):\n",
-    "    severeEffectsBatchCodeTable = createSevereEffectsBatchCodeTable(createDataFrameSevereEffectsFromFiles(\"VAERS\", '1'))\n",
+    "    severeEffectsBatchCodeTable = createSevereEffectsBatchCodeTable(\n",
+    "        filterDataFrameForSevereEffects(\n",
+    "            createDataFrameFromDescrs(\n",
+    "                readAllVaersDescrs(\"VAERS\")),\n",
+    "                dose = '1'))\n",
     "    display('severeEffectsBatchCodeTable', severeEffectsBatchCodeTable)\n",
     "    severeEffectsBatchCodeTable.to_excel(excelFile)"
    ]