diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 7865431572d..a3747a90a91 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -85,10 +85,6 @@ " isDose = df[\"VAX_DOSE_SERIES\"].str.contains(dose) if dose is not None else True\n", " return df[isCovid19 & isManufacturer & isDose]\n", "\n", - "# FK-TODO: inline method\n", - "def createAndFilterDataFrameFromDescrs(vaersDescrs, manufacturer, dose):\n", - " return filterDataFrame(createDataFrameFromDescrs(vaersDescrs), manufacturer = manufacturer, dose = dose)\n", - "\n", "def filterDataFrameForSevereEffects(df, dose):\n", " return filterDataFrame(df, dose = dose)\n" ] @@ -102,7 +98,7 @@ "source": [ "# FK-TODO: inline method\n", "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n", - " return createAndFilterDataFrameFromDescrs(readAllVaersDescrs(dataDir), manufacturer, dose)\n" + " return filterDataFrame(createDataFrameFromDescrs(readAllVaersDescrs(dataDir)), manufacturer = manufacturer, dose = dose)\n" ] }, { @@ -216,9 +212,10 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", - " dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", + " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -289,9 +286,10 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", - " dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", + " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -321,9 +319,10 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", + " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", - " dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '2')\n", + " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '2')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -350,7 +349,7 @@ "class BatchCodeTableTest(unittest.TestCase):\n", "\n", " def test_createBatchCodeTable2(self):\n", - " dataFrame = createAndFilterDataFrameFromDescrs(\n", + " dataFrame = createDataFrameFromDescrs(\n", " [\n", " {\n", " 'VAERSDATA': self.createDataFrame(\n", @@ -386,10 +385,8 @@ " \"1996874\"],\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", - " ],\n", - " \"MODERNA\",\n", - " '1')\n", - "\n", + " ])\n", + " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n", " self._test_createBatchCodeTable(dataFrame);\n", "\n", " def test_createBatchCodeTable(self):\n",