refactoring

HowBadIsMyBatch.ipynb

@@ -361,6 +361,39 @@
     "        return SummationTableFactory.createSummationTableHavingSevereReportsColumn(dataFrame.groupby('VAX_LOT'))\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6aa28541",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "\n",
+    "class IOUtils:\n",
+    "\n",
+    "    @staticmethod\n",
+    "    def saveDataFrame(dataFrame, file):\n",
+    "        IOUtils.saveDataFrameAsExcelFile(dataFrame, file)\n",
+    "        IOUtils.saveDataFrameAsHtml(dataFrame, file)\n",
+    "\n",
+    "    @staticmethod\n",
+    "    def saveDataFrameAsExcelFile(dataFrame, file):\n",
+    "        IOUtils.ensurePath(file)\n",
+    "        dataFrame.to_excel(file + '.xlsx')\n",
+    "\n",
+    "    @staticmethod\n",
+    "    def saveDataFrameAsHtml(dataFrame, file):\n",
+    "        IOUtils.ensurePath(file)\n",
+    "        dataFrame.to_html(file + '.html')\n",
+    "\n",
+    "    @staticmethod\n",
+    "    def ensurePath(file):\n",
+    "        directory = os.path.dirname(file)\n",
+    "        if not os.path.exists(directory):\n",
+    "            os.makedirs(directory)\n"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -883,33 +916,6 @@
     "unittest.main(argv = [''], verbosity = 2, exit = False)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "49f3544e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "\n",
-    "def ensurePath(file):\n",
-    "    directory = os.path.dirname(file)\n",
-    "    if not os.path.exists(directory):\n",
-    "        os.makedirs(directory)\n",
-    "\n",
-    "def saveDataFrameAsExcelFile(dataFrame, file):\n",
-    "    ensurePath(file)\n",
-    "    dataFrame.to_excel(file + '.xlsx')\n",
-    "\n",
-    "def saveDataFrameAsHtml(dataFrame, file):\n",
-    "    ensurePath(file)\n",
-    "    dataFrame.to_html(file + '.html')\n",
-    "\n",
-    "def saveDataFrame(dataFrame, file):\n",
-    "    saveDataFrameAsExcelFile(dataFrame, file)\n",
-    "    saveDataFrameAsHtml(dataFrame, file)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -927,7 +933,7 @@
     "    return getVaers(VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs)\n",
     "\n",
     "def getNonDomesticVaers():\n",
-    "    return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])\n"
+    "    return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])"
    ]
   },
   {
@@ -940,7 +946,7 @@
     "def saveBatchCodeTable(vaers, manufacturer, file):\n",
     "    batchCodeTable = BatchCodeTableFactory.createBatchCodeTable(vaers, manufacturer = manufacturer, dose = '1')\n",
     "    display(batchCodeTable)\n",
-    "    saveDataFrame(batchCodeTable, file)\n"
+    "    IOUtils.saveDataFrame(batchCodeTable, file)"
    ]
   },
   {
@@ -969,7 +975,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/moderna.html\n",
-    "saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna)"
+    "saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna\")"
    ]
   },
   {
@@ -1038,7 +1044,7 @@
     "nonDomesticCovid19Vaers = DataFrameFilter().filterByCovid19(nonDomesticVaers)\n",
     "batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(nonDomesticCovid19Vaers)\n",
     "display(batchCodeTable)\n",
-    "saveDataFrame(batchCodeTable, \"results/batchCodes/international\")"
+    "IOUtils.saveDataFrame(batchCodeTable, \"results/batchCodes/international\")"
    ]
   },
   {
@@ -1059,7 +1065,7 @@
     "def saveSevereEffectsBatchCodeTable(vaers, file):\n",
     "    severeEffectsBatchCodeTable = BatchCodeTableFactory.createSevereEffectsBatchCodeTable(vaers, dose = '1')\n",
     "    display(severeEffectsBatchCodeTable)\n",
-    "    saveDataFrame(severeEffectsBatchCodeTable, file)"
+    "    IOUtils.saveDataFrame(severeEffectsBatchCodeTable, file)"
    ]
   },
   {
@@ -1099,7 +1105,7 @@
    "outputs": [],
    "source": [
     "doseByMonthTable = DoseTableFactory.createDoseByMonthTable(vaers)\n",
-    "saveDataFrame(doseByMonthTable, 'results/firstsecond/doseByMonthTable')\n",
+    "IOUtils.saveDataFrame(doseByMonthTable, 'results/firstsecond/doseByMonthTable')\n",
     "doseByMonthTable"
    ]
   },
@@ -1139,7 +1145,7 @@
    "outputs": [],
    "source": [
     "internationalLotTable = internationalLotTable[internationalLotTable['Total reports'] > 50]\n",
-    "saveDataFrame(internationalLotTable, 'results/international/International_Deadly_Lots')\n",
+    "IOUtils.saveDataFrame(internationalLotTable, 'results/international/International_Deadly_Lots')\n",
     "internationalLotTable"
    ]
   },
@@ -1153,7 +1159,7 @@
     "def createAndSaveAndDisplayBatchCodeTableByCountry(nonDomesticVaers, country):\n",
     "    batchCodeTable = InternationalLotTableFactory.createBatchCodeTableByCountry(nonDomesticVaers, country)\n",
     "    batchCodeTable = batchCodeTable[batchCodeTable['Total reports'] > 50]\n",
-    "    saveDataFrame(batchCodeTable, 'results/international/' + country)\n",
+    "    IOUtils.saveDataFrame(batchCodeTable, 'results/international/' + country)\n",
     "    display(country + \":\", batchCodeTable)\n",
     "\n",
     "def createAndSaveAndDisplayBatchCodeTablesByCountry(nonDomesticVaers, countries):\n",