From a6c5ae63856eda9612b2ad82f9c415ac39ec168a Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Wed, 16 Feb 2022 23:25:27 +0100
Subject: [PATCH] refactoring

---
 src/HowBadIsMyBatch.ipynb | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index fad766997ac..94be9db0104 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -1129,8 +1129,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "def getVaersForYears(years):\n",
+    "    return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears(years))\n",
+    "\n",
     "def getVaersForYear(year):\n",
-    "    return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n",
+    "    return getVaersForYears([year])\n",
+    "\n",
+    "def getNonDomesticVaers():\n",
+    "    return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
+    "\n",
+    "def _getVaersDescrReader():\n",
+    "    return VaersDescrReader(dataDir = \"VAERS\")\n",
     "\n",
     "def _getVaers(vaersDescrsReaderFunc):\n",
     "    vaersDescrs = vaersDescrsReaderFunc()\n",
@@ -1138,9 +1147,6 @@
     "    DataFrameNormalizer.normalize(dataFrame)\n",
     "    dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
     "    return dataFrame\n",
-    "\n",
-    "def _getVaersDescrReader():\n",
-    "    return VaersDescrReader(dataDir = \"VAERS\")\n",
     "    "
    ]
   },
@@ -1151,7 +1157,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "vaers = _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
+    "vaers = getVaersForYears([\"2021\", \"2022\"])\n",
     "vaers"
    ]
   },
@@ -1162,7 +1168,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "nonDomesticVaers = _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
+    "nonDomesticVaers = getNonDomesticVaers()\n",
     "nonDomesticVaers"
    ]
   },
@@ -1177,6 +1183,17 @@
     "internationalVaers"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "dddde600",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "vaers2019 = getVaersForYear(\"2019\")\n",
+    "vaers2019"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "987a04d1",