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 14:18:00 +01:00
parent bcacc211f6
commit 8e4a4f632f
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/HowBadIsMyBatch.ipynb
View File

@@ -35,17 +35,15 @@
" return [self.readVaersDescr(year) for year in years]\n",
"\n",
" def readVaersDescr(self, year):\n",
" folder = self.dataDir + \"/\" + year + \"VAERSData/\"\n",
" return {\n",
" 'VAERSDATA': self._readVAERSDATA(folder + year + \"VAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(folder + year + \"VAERSVAX.csv\")\n",
" 'VAERSDATA': self._readVAERSDATA(self.dataDir + \"/\" + year + \"VAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(self.dataDir + \"/\" + year + \"VAERSVAX.csv\")\n",
" }\n",
"\n",
" def readNonDomesticVaersDescr(self):\n",
" folder = self.dataDir + \"/NonDomesticVAERSData/\"\n",
" return {\n",
" 'VAERSDATA': self._readVAERSDATA(folder + \"NonDomesticVAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(folder + \"NonDomesticVAERSVAX.csv\")\n",
" 'VAERSDATA': self._readVAERSDATA(self.dataDir + \"/\" + \"NonDomesticVAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(self.dataDir + \"/\" + \"NonDomesticVAERSVAX.csv\")\n",
" }\n",
"\n",
" def _readVAERSDATA(self, file):\n",
@@ -1062,10 +1060,10 @@
" return dataFrame\n",
" \n",
"def getAllVaers():\n",
" return getVaers(VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs)\n",
" return getVaers(VaersDescrReader(dataDir = \"VAERS/AllVAERSDataCSVS\").readAllVaersDescrs)\n",
"\n",
"def getNonDomesticVaers():\n",
" return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])\n",
" return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS/AllVAERSDataCSVS').readNonDomesticVaersDescr()])\n",
"\n",
"def getInternationalVaers():\n",
" return pd.concat([getAllVaers(), getNonDomesticVaers()])"