From e7d85c2e08e22516d840ea8e4bda120b23759f1c Mon Sep 17 00:00:00 2001 From: frankknoll Date: Tue, 25 Jan 2022 21:15:55 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 20f7a5120e6..89b11b72e95 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -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",