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 21:00:32 +01:00
parent c16183fc97
commit fcca425e6e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/HowBadIsMyBatch.ipynb
View File

@@ -28,9 +28,6 @@
" def __init__(self, dataDir):\n", " def __init__(self, dataDir):\n",
" self.dataDir = dataDir \n", " self.dataDir = dataDir \n",
"\n", "\n",
" def readAllVaersDescrs(self):\n",
" return self.readVaersDescrs([\"2021\", \"2022\"])\n",
" \n",
" def readVaersDescrs(self, years):\n", " def readVaersDescrs(self, years):\n",
" return [self.readVaersDescr(year) for year in years]\n", " return [self.readVaersDescr(year) for year in years]\n",
"\n", "\n",
@@ -930,7 +927,7 @@
"\n", "\n",
" def test_createBatchCodeTableFromFiles(self):\n", " def test_createBatchCodeTableFromFiles(self):\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" VaersDescrReader(dataDir = \"test/VAERS\").readAllVaersDescrs())\n", " VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrs([\"2021\", \"2022\"]))\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" self._test_createBatchCodeTable(dataFrame, '1')\n", " self._test_createBatchCodeTable(dataFrame, '1')\n",
"\n", "\n",
@@ -1139,14 +1136,20 @@
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n", " return dataFrame\n",
"\n", "\n",
"def getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")\n",
"\n",
"def getAllVaers():\n", "def getAllVaers():\n",
" return getVaers(VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs)\n", " return getVaers(lambda: getVaersDescrReader().readVaersDescrs([\"2021\", \"2022\"]))\n",
"\n", "\n",
"def getNonDomesticVaers():\n", "def getNonDomesticVaers():\n",
" return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])\n", " return getVaers(lambda: [getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"\n", "\n",
"def getInternationalVaers():\n", "def getInternationalVaers():\n",
" return pd.concat([getAllVaers(), getNonDomesticVaers()])" " return pd.concat([getAllVaers(), getNonDomesticVaers()])\n",
"\n",
"def getVaersForYear(year):\n",
" return getVaers(lambda: [getVaersDescrReader().readVaersDescr(year)])"
] ]
}, },
{ {