refactoring

This commit is contained in:
frankknoll
2022-02-17 10:55:51 +01:00
parent a6c5ae6385
commit 8b7fd1a98d

View File

@@ -1130,19 +1130,18 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"def getVaersForYears(years):\n", "def getVaersForYears(years):\n",
" return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears(years))\n", " return _getVaers(_getVaersDescrReader().readVaersDescrsForYears(years))\n",
"\n", "\n",
"def getVaersForYear(year):\n", "def getVaersForYear(year):\n",
" return getVaersForYears([year])\n", " return getVaersForYears([year])\n",
"\n", "\n",
"def getNonDomesticVaers():\n", "def getNonDomesticVaers():\n",
" return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n", " return _getVaers([_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"\n", "\n",
"def _getVaersDescrReader():\n", "def _getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")\n", " return VaersDescrReader(dataDir = \"VAERS\")\n",
"\n", "\n",
"def _getVaers(vaersDescrsReaderFunc):\n", "def _getVaers(vaersDescrs):\n",
" vaersDescrs = vaersDescrsReaderFunc()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",