refactoring

This commit is contained in:
frankknoll
2022-01-25 21:15:55 +01:00
parent cbd32489f3
commit e7d85c2e08

View File

@@ -21,12 +21,12 @@
"metadata": {},
"outputs": [],
"source": [
"def createDataFrame(baseDir, manufacturer):\n",
"def createDataFrame(dataDir, manufacturer):\n",
" def read_csv(file, usecols):\n",
" return pd.read_csv(file, index_col='VAERS_ID', encoding='latin1', low_memory=False, usecols=usecols)\n",
" \n",
" def createDataFrameForYear(year):\n",
" folder = baseDir + \"/VAERS/\" + year + \"VAERSData/\"\n",
" folder = dataDir + \"/\" + year + \"VAERSData/\"\n",
" return pd.merge(\n",
" read_csv(folder + year + \"VAERSDATA.csv\", ['VAERS_ID','DIED', 'L_THREAT', 'DISABLE']),\n",
" read_csv(folder + year + \"VAERSVAX.csv\", ['VAERS_ID','VAX_TYPE', 'VAX_MANU', 'VAX_LOT']),\n",
@@ -64,7 +64,7 @@
"metadata": {},
"outputs": [],
"source": [
"df_moderna = createDataFrame(\".\", \"MODERNA\")"
"df_moderna = createDataFrame(\"VAERS\", \"MODERNA\")"
]
},
{
@@ -123,7 +123,7 @@
"\n",
" def test_createPivotTable(self):\n",
" # Given\n",
" pivotTable = createPivotTable(createDataFrame(\"test\", \"MODERNA\"))\n",
" pivotTable = createPivotTable(createDataFrame(\"test/VAERS\", \"MODERNA\"))\n",
"\n",
" # When\n",
" pivotTableExpected = pd.DataFrame(\n",