From cfd44b6d8c5414b77ae41c73eb36f639c4495a53 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Tue, 8 Feb 2022 19:30:42 +0100
Subject: [PATCH] refactoring

---
 HowBadIsMyBatch.ipynb | 87 +++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb
index ae4286a335d..f80c646c4ab 100644
--- a/HowBadIsMyBatch.ipynb
+++ b/HowBadIsMyBatch.ipynb
@@ -910,15 +910,42 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def saveBatchCodeTable(manufacturer, excelFile):\n",
-    "    vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
+    "def getVaers(vaersDescrsReaderFunc):\n",
+    "    vaersDescrs = vaersDescrsReaderFunc()\n",
     "    dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
     "    DataFrameNormalizer.normalize(dataFrame)\n",
-    "    batchCodeTable = BatchCodeTableFactory.createBatchCodeTable(dataFrame, manufacturer = manufacturer, dose = '1')\n",
+    "    return dataFrame\n",
+    "    \n",
+    "def getAllVaers():\n",
+    "    return getVaers(VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs)\n",
+    "\n",
+    "def getNonDomesticVaers():\n",
+    "    return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "e15bdcc0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def saveBatchCodeTable(vaers, manufacturer, excelFile):\n",
+    "    batchCodeTable = BatchCodeTableFactory.createBatchCodeTable(vaers, manufacturer = manufacturer, dose = '1')\n",
     "    display(batchCodeTable)\n",
     "    saveDataFrameAsExcelFile(batchCodeTable, excelFile)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9ee014eb",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "vaers = getAllVaers()"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "987a04d1",
@@ -935,7 +962,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/moderna.html\n",
-    "saveBatchCodeTable(\"MODERNA\", \"results/batchCodes/moderna.xlsx\")"
+    "saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna.xlsx\")"
    ]
   },
   {
@@ -954,7 +981,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/pfizer.html\n",
-    "saveBatchCodeTable(\"PFIZER\\BIONTECH\", \"results/batchCodes/pfizer.xlsx\")"
+    "saveBatchCodeTable(vaers, \"PFIZER\\BIONTECH\", \"results/batchCodes/pfizer.xlsx\")"
    ]
   },
   {
@@ -973,7 +1000,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/janssen.html\n",
-    "saveBatchCodeTable(\"JANSSEN\", \"results/batchCodes/janssen.xlsx\")"
+    "saveBatchCodeTable(vaers, \"JANSSEN\", \"results/batchCodes/janssen.xlsx\")"
    ]
   },
   {
@@ -991,11 +1018,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def saveSevereEffectsBatchCodeTable(excelFile):\n",
-    "    vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
-    "    dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
-    "    DataFrameNormalizer.normalize(dataFrame)\n",
-    "    severeEffectsBatchCodeTable = BatchCodeTableFactory.createSevereEffectsBatchCodeTable(dataFrame, dose = '1')\n",
+    "def saveSevereEffectsBatchCodeTable(vaers, excelFile):\n",
+    "    severeEffectsBatchCodeTable = BatchCodeTableFactory.createSevereEffectsBatchCodeTable(vaers, dose = '1')\n",
     "    display(severeEffectsBatchCodeTable)\n",
     "    saveDataFrameAsExcelFile(severeEffectsBatchCodeTable, excelFile)"
    ]
@@ -1007,7 +1031,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "saveSevereEffectsBatchCodeTable('results/severeEffects.xlsx')"
+    "saveSevereEffectsBatchCodeTable(vaers, 'results/severeEffects.xlsx')"
    ]
   },
   {
@@ -1026,28 +1050,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/firstsecond.html\n",
-    "\n",
-    "def createDoseTable():\n",
-    "    vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
-    "    dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
-    "    DataFrameNormalizer.normalize(dataFrame)\n",
-    "    return DoseTableFactory.createDoseTable(dataFrame)\n",
-    "\n",
-    "def createDoseByMonthTable():\n",
-    "    vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
-    "    dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
-    "    DataFrameNormalizer.normalize(dataFrame)\n",
-    "    return DoseTableFactory.createDoseByMonthTable(dataFrame)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "394fa19d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "createDoseTable()"
+    "DoseTableFactory.createDoseTable(vaers)"
    ]
   },
   {
@@ -1057,7 +1060,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "doseByMonthTable = createDoseByMonthTable()\n",
+    "doseByMonthTable = DoseTableFactory.createDoseByMonthTable(vaers)\n",
     "saveDataFrameAsExcelFile(doseByMonthTable, 'results/firstsecond/doseByMonthTable.xlsx')\n",
     "doseByMonthTable"
    ]
@@ -1079,12 +1082,6 @@
    "source": [
     "# https://www.howbadismybatch.com/international.html\n",
     "\n",
-    "def getNonDomesticVaers():\n",
-    "    vaersDescr = VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()\n",
-    "    dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescr(vaersDescr)\n",
-    "    DataFrameNormalizer.normalize(dataFrame)\n",
-    "    return dataFrame\n",
-    "\n",
     "nonDomesticVaers = getNonDomesticVaers()"
    ]
   },
@@ -1152,6 +1149,14 @@
     "        'Australia'\n",
     "    ])"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ea8e4d13",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {