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:12:43 +01:00
parent efc9b87349
commit 5274d53d18
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/HowBadIsMyBatch.ipynb
View File

@@ -1129,15 +1129,6 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"def getAllVaers():\n",
" return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
"\n",
"def getNonDomesticVaers():\n",
" return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"\n",
"def getInternationalVaers():\n",
" return pd.concat([getAllVaers(), getNonDomesticVaers()])\n",
"\n",
"def getVaersForYear(year):\n", "def getVaersForYear(year):\n",
" return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n", " return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n",
"\n", "\n",
@@ -1149,37 +1140,41 @@
" return dataFrame\n", " return dataFrame\n",
"\n", "\n",
"def _getVaersDescrReader():\n", "def _getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")" " return VaersDescrReader(dataDir = \"VAERS\")\n",
" "
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"id": "9ee014eb", "id": "8e3bc9b3",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"vaers = getAllVaers()" "vaers = _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
"vaers"
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"id": "c96391fc", "id": "fbf5006a",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"nonDomesticVaers = getNonDomesticVaers()" "nonDomesticVaers = _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"nonDomesticVaers"
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"id": "404b496a", "id": "781ac80e",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"internationalVaers = getInternationalVaers()" "internationalVaers = pd.concat([vaers, nonDomesticVaers])\n",
"internationalVaers"
] ]
}, },
{ {