diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 4ba958272a1..e7ed383aa0d 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -28,9 +28,6 @@ " def __init__(self, dataDir):\n", " self.dataDir = dataDir \n", "\n", - " def readAllVaersDescrs(self):\n", - " return self.readVaersDescrs([\"2021\", \"2022\"])\n", - " \n", " def readVaersDescrs(self, years):\n", " return [self.readVaersDescr(year) for year in years]\n", "\n", @@ -930,7 +927,7 @@ "\n", " def test_createBatchCodeTableFromFiles(self):\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", - " VaersDescrReader(dataDir = \"test/VAERS\").readAllVaersDescrs())\n", + " VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrs([\"2021\", \"2022\"]))\n", " DataFrameNormalizer.normalize(dataFrame)\n", " self._test_createBatchCodeTable(dataFrame, '1')\n", "\n", @@ -1138,15 +1135,21 @@ " DataFrameNormalizer.normalize(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " return dataFrame\n", - " \n", + "\n", + "def getVaersDescrReader():\n", + " return VaersDescrReader(dataDir = \"VAERS\")\n", + "\n", "def getAllVaers():\n", - " return getVaers(VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs)\n", + " return getVaers(lambda: getVaersDescrReader().readVaersDescrs([\"2021\", \"2022\"]))\n", "\n", "def getNonDomesticVaers():\n", - " return getVaers(lambda: [VaersDescrReader(dataDir = 'VAERS').readNonDomesticVaersDescr()])\n", + " return getVaers(lambda: [getVaersDescrReader().readNonDomesticVaersDescr()])\n", "\n", "def getInternationalVaers():\n", - " return pd.concat([getAllVaers(), getNonDomesticVaers()])" + " return pd.concat([getAllVaers(), getNonDomesticVaers()])\n", + "\n", + "def getVaersForYear(year):\n", + " return getVaers(lambda: [getVaersDescrReader().readVaersDescr(year)])" ] }, {