diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index e7ed383aa0d..36f4d037481 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -28,10 +28,10 @@ " def __init__(self, dataDir):\n", " self.dataDir = dataDir \n", "\n", - " def readVaersDescrs(self, years):\n", - " return [self.readVaersDescr(year) for year in years]\n", + " def readVaersDescrsForYears(self, years):\n", + " return [self.readVaersDescrForYear(year) for year in years]\n", "\n", - " def readVaersDescr(self, year):\n", + " def readVaersDescrForYear(self, year):\n", " return {\n", " 'VAERSDATA': self._readVAERSDATA(self.dataDir + \"/\" + year + \"VAERSDATA.csv\"),\n", " 'VAERSVAX': self._readVAERSVAX(self.dataDir + \"/\" + year + \"VAERSVAX.csv\")\n", @@ -927,7 +927,7 @@ "\n", " def test_createBatchCodeTableFromFiles(self):\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", - " VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrs([\"2021\", \"2022\"]))\n", + " VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrsForYears([\"2021\", \"2022\"]))\n", " DataFrameNormalizer.normalize(dataFrame)\n", " self._test_createBatchCodeTable(dataFrame, '1')\n", "\n", @@ -1129,27 +1129,27 @@ "metadata": {}, "outputs": [], "source": [ - "def getVaers(vaersDescrsReaderFunc):\n", + "def getAllVaers():\n", + " return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n", + "\n", + "def getNonDomesticVaers():\n", + " return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n", + "\n", + "def getInternationalVaers():\n", + " return pd.concat([getAllVaers(), getNonDomesticVaers()])\n", + "\n", + "def getVaersForYear(year):\n", + " return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n", + "\n", + "def _getVaers(vaersDescrsReaderFunc):\n", " vaersDescrs = vaersDescrsReaderFunc()\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " DataFrameNormalizer.normalize(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " return dataFrame\n", "\n", - "def getVaersDescrReader():\n", - " return VaersDescrReader(dataDir = \"VAERS\")\n", - "\n", - "def getAllVaers():\n", - " return getVaers(lambda: getVaersDescrReader().readVaersDescrs([\"2021\", \"2022\"]))\n", - "\n", - "def getNonDomesticVaers():\n", - " return getVaers(lambda: [getVaersDescrReader().readNonDomesticVaersDescr()])\n", - "\n", - "def getInternationalVaers():\n", - " return pd.concat([getAllVaers(), getNonDomesticVaers()])\n", - "\n", - "def getVaersForYear(year):\n", - " return getVaers(lambda: [getVaersDescrReader().readVaersDescr(year)])" + "def _getVaersDescrReader():\n", + " return VaersDescrReader(dataDir = \"VAERS\")" ] }, { @@ -1537,12 +1537,6 @@ "source": [ "see https://www.bitchute.com/video/4HlIyBmOEJeY/ and https://www.bitchute.com/video/8wJYP2NpGwN2/" ] - }, - { - "cell_type": "markdown", - "id": "37ccbee6", - "metadata": {}, - "source": [] } ], "metadata": {