francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-02-16 23:25:27 +01:00
parent 5274d53d18
commit a6c5ae6385
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/HowBadIsMyBatch.ipynb
View File

@@ -1129,8 +1129,17 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"def getVaersForYears(years):\n",
" return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears(years))\n",
"\n",
"def getVaersForYear(year):\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", "\n",
"def _getVaers(vaersDescrsReaderFunc):\n", "def _getVaers(vaersDescrsReaderFunc):\n",
" vaersDescrs = vaersDescrsReaderFunc()\n", " vaersDescrs = vaersDescrsReaderFunc()\n",
@@ -1138,9 +1147,6 @@
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n", " return dataFrame\n",
"\n",
"def _getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")\n",
" " " "
] ]
}, },
@@ -1151,7 +1157,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"vaers = _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n", "vaers = getVaersForYears([\"2021\", \"2022\"])\n",
"vaers" "vaers"
] ]
}, },
@@ -1162,7 +1168,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"nonDomesticVaers = _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n", "nonDomesticVaers = getNonDomesticVaers()\n",
"nonDomesticVaers" "nonDomesticVaers"
] ]
}, },
@@ -1177,6 +1183,17 @@
"internationalVaers" "internationalVaers"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "dddde600",
"metadata": {},
"outputs": [],
"source": [
"vaers2019 = getVaersForYear(\"2019\")\n",
"vaers2019"
]
},
{ {
"cell_type": "markdown", "cell_type": "markdown",
"id": "987a04d1", "id": "987a04d1",