From c7475837863794062469cd84bf7363ffd920c41d Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sun, 20 Feb 2022 20:49:44 +0100 Subject: [PATCH] refactoring --- src/HowBadIsMyBatch.ipynb | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 3615d376fb5..7d3b52ab564 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -1285,28 +1285,26 @@ "def getVaersForYear(year):\n", " return getVaersForYears([year])\n", "\n", - "# FK-TODO: DRY with getNonDomesticVaers()\n", "def getVaersForYears(years):\n", - " vaersDescrs = _getVaersDescrReader().readVaersDescrsForYears(years)\n", - " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame['COUNTRY'] = 'United States'\n", - " DataFrameNormalizer.normalize(dataFrame)\n", - " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", - " return dataFrame\n", + " def addCountryColumn(dataFrame):\n", + " dataFrame['COUNTRY'] = 'United States'\n", + " return dataFrame\n", + "\n", + " return _getVaers(\n", + " _getVaersDescrReader().readVaersDescrsForYears(years),\n", + " addCountryColumn)\n", "\n", "def getNonDomesticVaers():\n", - " vaersDescrs = [_getVaersDescrReader().readNonDomesticVaersDescr()]\n", - " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame = CountryColumnAdder.addCountryColumn(dataFrame)\n", - " DataFrameNormalizer.normalize(dataFrame)\n", - " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", - " return dataFrame\n", + " return _getVaers(\n", + " [_getVaersDescrReader().readNonDomesticVaersDescr()],\n", + " CountryColumnAdder.addCountryColumn)\n", "\n", "def _getVaersDescrReader():\n", " return VaersDescrReader(dataDir = \"VAERS\")\n", "\n", - "def _getVaers(vaersDescrs):\n", + "def _getVaers(vaersDescrs, addCountryColumn):\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = addCountryColumn(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " return dataFrame\n",