diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index a7f3482dc9f..936d2325370 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -21,7 +21,7 @@ "metadata": {}, "outputs": [], "source": [ - "def _createDataFrame(vaersDescrs, manufacturer, dose):\n", + "def createDataFrameFromDescrs(vaersDescrs, manufacturer, dose):\n", " def filter(df):\n", " return df[\n", " (df[\"VAX_TYPE\"] == \"COVID19\") &\n", @@ -58,11 +58,18 @@ "\n", " folder = dataDir + \"/\" + year + \"VAERSData/\"\n", " return {\n", - " 'VAERSDATA': read_csv(folder + year + \"VAERSDATA.csv\", ['VAERS_ID', 'DIED', 'L_THREAT', 'DISABLE']),\n", - " 'VAERSVAX': read_csv(folder + year + \"VAERSVAX.csv\", ['VAERS_ID', 'VAX_DOSE_SERIES', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT'], dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n", + " 'VAERSDATA':\n", + " read_csv(\n", + " folder + year + \"VAERSDATA.csv\",\n", + " ['VAERS_ID', 'DIED', 'L_THREAT', 'DISABLE']),\n", + " 'VAERSVAX':\n", + " read_csv(\n", + " folder + year + \"VAERSVAX.csv\",\n", + " ['VAERS_ID', 'VAX_DOSE_SERIES', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT'],\n", + " dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n", " }\n", "\n", - " return _createDataFrame(\n", + " return createDataFrameFromDescrs(\n", " [readVaersDescr(\"2021\"), readVaersDescr(\"2022\")],\n", " manufacturer,\n", " dose)" @@ -108,7 +115,7 @@ "\n", "class CreateDataFrameTest(unittest.TestCase):\n", "\n", - " def test_createDataFrame(self):\n", + " def test_createDataFrameFromDescrs(self):\n", " # Given\n", " vaersDescrs = [\n", " {\n", @@ -140,7 +147,7 @@ " ]\n", " \n", " # When\n", - " dataFrame = _createDataFrame(vaersDescrs, \"MODERNA\", '1')\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -152,7 +159,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n", "\n", - " def test_createDataFrameWithFirstDose(self):\n", + " def test_createDataFrameFromDescrsWithFirstDose(self):\n", " # Given\n", " vaersDescrs = [\n", " {\n", @@ -170,7 +177,7 @@ " ]\n", " \n", " # When\n", - " dataFrame = _createDataFrame(vaersDescrs, \"MODERNA\", '1')\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -180,7 +187,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n", "\n", - " def test_createDataFrameWithSecondDose(self):\n", + " def test_createDataFrameFromDescrsWithSecondDose(self):\n", " # Given\n", " vaersDescrs = [\n", " {\n", @@ -198,7 +205,7 @@ " ]\n", " \n", " # When\n", - " dataFrame = _createDataFrame(vaersDescrs, \"MODERNA\", '2')\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '2')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -224,7 +231,7 @@ "class BatchCodeTableTest(unittest.TestCase):\n", "\n", " def test_createBatchCodeTable2(self):\n", - " dataFrame = _createDataFrame(\n", + " dataFrame = createDataFrameFromDescrs(\n", " [\n", " {\n", " 'VAERSDATA': self.createDataFrame(\n", @@ -314,14 +321,6 @@ "saveBatchCodeTable(\"PFIZER\\BIONTECH\", \"results/pfizer.xlsx\")\n", "saveBatchCodeTable(\"JANSSEN\", \"results/janssen.xlsx\")" ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "d0f623c1", - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": {