refactoring
This commit is contained in:
@@ -21,12 +21,12 @@
|
|||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"def createDataFrame(baseDir, manufacturer):\n",
|
"def createDataFrame(dataDir, manufacturer):\n",
|
||||||
" def read_csv(file, usecols):\n",
|
" def read_csv(file, usecols):\n",
|
||||||
" return pd.read_csv(file, index_col='VAERS_ID', encoding='latin1', low_memory=False, usecols=usecols)\n",
|
" return pd.read_csv(file, index_col='VAERS_ID', encoding='latin1', low_memory=False, usecols=usecols)\n",
|
||||||
" \n",
|
" \n",
|
||||||
" def createDataFrameForYear(year):\n",
|
" def createDataFrameForYear(year):\n",
|
||||||
" folder = baseDir + \"/VAERS/\" + year + \"VAERSData/\"\n",
|
" folder = dataDir + \"/\" + year + \"VAERSData/\"\n",
|
||||||
" return pd.merge(\n",
|
" return pd.merge(\n",
|
||||||
" read_csv(folder + year + \"VAERSDATA.csv\", ['VAERS_ID','DIED', 'L_THREAT', 'DISABLE']),\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",
|
" read_csv(folder + year + \"VAERSVAX.csv\", ['VAERS_ID','VAX_TYPE', 'VAX_MANU', 'VAX_LOT']),\n",
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"df_moderna = createDataFrame(\".\", \"MODERNA\")"
|
"df_moderna = createDataFrame(\"VAERS\", \"MODERNA\")"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
"\n",
|
"\n",
|
||||||
" def test_createPivotTable(self):\n",
|
" def test_createPivotTable(self):\n",
|
||||||
" # Given\n",
|
" # Given\n",
|
||||||
" pivotTable = createPivotTable(createDataFrame(\"test\", \"MODERNA\"))\n",
|
" pivotTable = createPivotTable(createDataFrame(\"test/VAERS\", \"MODERNA\"))\n",
|
||||||
"\n",
|
"\n",
|
||||||
" # When\n",
|
" # When\n",
|
||||||
" pivotTableExpected = pd.DataFrame(\n",
|
" pivotTableExpected = pd.DataFrame(\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user