refactoring

This commit is contained in:
frankknoll
2022-02-05 14:38:20 +01:00
parent e7663350c1
commit 6fc1722930

View File

@@ -37,22 +37,22 @@
" def readVaersDescr(self, year):\n",
" folder = self.dataDir + \"/\" + year + \"VAERSData/\"\n",
" return {\n",
" 'VAERSDATA': self._readVAERSDATA(folder, year),\n",
" 'VAERSVAX': self._readVAERSVAX(folder, year)\n",
" 'VAERSDATA': self._readVAERSDATA(folder + year + \"VAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(folder + year + \"VAERSVAX.csv\")\n",
" }\n",
"\n",
" def _readVAERSDATA(self, folder, year):\n",
" def _readVAERSDATA(self, file):\n",
" VAERSDATA = self._read_csv(\n",
" file = folder + year + \"VAERSDATA.csv\",\n",
" file = file,\n",
" usecols = ['VAERS_ID', 'DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT'])\n",
" VaersDescrReader._convertColumnsOfDataFrameToNumerics(\n",
" VAERSDATA,\n",
" ['DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT'])\n",
" return VAERSDATA\n",
"\n",
" def _readVAERSVAX(self, folder, year):\n",
" def _readVAERSVAX(self, file):\n",
" return self._read_csv(\n",
" file = folder + year + \"VAERSVAX.csv\",\n",
" file = file,\n",
" usecols = ['VAERS_ID', 'VAX_DOSE_SERIES', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT'],\n",
" dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n",
"\n",