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-20 20:49:44 +01:00
parent 75948bfd91
commit c747583786
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/HowBadIsMyBatch.ipynb
View File

@@ -1285,28 +1285,26 @@
"def getVaersForYear(year):\n", "def getVaersForYear(year):\n",
" return getVaersForYears([year])\n", " return getVaersForYears([year])\n",
"\n", "\n",
"# FK-TODO: DRY with getNonDomesticVaers()\n",
"def getVaersForYears(years):\n", "def getVaersForYears(years):\n",
" vaersDescrs = _getVaersDescrReader().readVaersDescrsForYears(years)\n", " def addCountryColumn(dataFrame):\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame['COUNTRY'] = 'United States'\n",
" dataFrame['COUNTRY'] = 'United States'\n", " return dataFrame\n",
" DataFrameNormalizer.normalize(dataFrame)\n", "\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " return _getVaers(\n",
" return dataFrame\n", " _getVaersDescrReader().readVaersDescrsForYears(years),\n",
" addCountryColumn)\n",
"\n", "\n",
"def getNonDomesticVaers():\n", "def getNonDomesticVaers():\n",
" vaersDescrs = [_getVaersDescrReader().readNonDomesticVaersDescr()]\n", " return _getVaers(\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " [_getVaersDescrReader().readNonDomesticVaersDescr()],\n",
" dataFrame = CountryColumnAdder.addCountryColumn(dataFrame)\n", " CountryColumnAdder.addCountryColumn)\n",
" DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n",
"\n", "\n",
"def _getVaersDescrReader():\n", "def _getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")\n", " return VaersDescrReader(dataDir = \"VAERS\")\n",
"\n", "\n",
"def _getVaers(vaersDescrs):\n", "def _getVaers(vaersDescrs, addCountryColumn):\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame = addCountryColumn(dataFrame)\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n", " return dataFrame\n",