diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index d298a0f5a2b..fcc48c6c3f4 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -65,18 +65,24 @@ "metadata": {}, "outputs": [], "source": [ - "def createDataFrameFromDescr(vaersDescr):\n", - " return pd.merge(\n", - " vaersDescr['VAERSDATA'],\n", - " vaersDescr['VAERSVAX'],\n", - " how = 'left',\n", - " left_index = True,\n", - " right_index = True,\n", - " validate = 'one_to_many')\n", + "import pandas as pd\n", "\n", - "def createDataFrameFromDescrs(vaersDescrs):\n", - " dataFrames = [createDataFrameFromDescr(vaersDescr) for vaersDescr in vaersDescrs]\n", - " return pd.concat(dataFrames)\n" + "class VaersDescr2DataFrameConverter:\n", + "\n", + " @staticmethod\n", + " def createDataFrameFromDescr(vaersDescr):\n", + " return pd.merge(\n", + " vaersDescr['VAERSDATA'],\n", + " vaersDescr['VAERSVAX'],\n", + " how = 'left',\n", + " left_index = True,\n", + " right_index = True,\n", + " validate = 'one_to_many')\n", + "\n", + " @staticmethod\n", + " def createDataFrameFromDescrs(vaersDescrs):\n", + " dataFrames = [VaersDescr2DataFrameConverter.createDataFrameFromDescr(vaersDescr) for vaersDescr in vaersDescrs]\n", + " return pd.concat(dataFrames)\n" ] }, { @@ -209,7 +215,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", - " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n", @@ -248,7 +254,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", - " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", " dataFrame = filterDataFrameForSevereEffects(dataFrame, dose = '1')\n", @@ -283,7 +289,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", - " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n", @@ -316,7 +322,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " }\n", " ]\n", - " dataFrame = createDataFrameFromDescrs(vaersDescrs)\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " \n", " # When\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '2')\n", @@ -346,7 +352,7 @@ "class BatchCodeTableTest(unittest.TestCase):\n", "\n", " def test_createBatchCodeTable2(self):\n", - " dataFrame = createDataFrameFromDescrs(\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " [\n", " {\n", " 'VAERSDATA': self.createDataFrame(\n", @@ -389,7 +395,7 @@ " def test_createBatchCodeTable(self):\n", " self._test_createBatchCodeTable(\n", " filterDataFrame(\n", - " createDataFrameFromDescrs(\n", + " VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " VaersDescrReader(\"test/VAERS\").readAllVaersDescrs()),\n", " manufacturer = \"MODERNA\",\n", " dose = '1'))\n", @@ -426,7 +432,7 @@ "\n", " def test_createSevereEffectsBatchCodeTable(self):\n", " # Given\n", - " dataFrame = createDataFrameFromDescrs(\n", + " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " [\n", " {\n", " 'VAERSDATA': self.createDataFrame(\n", @@ -490,7 +496,7 @@ "def saveBatchCodeTable(manufacturer, excelFile):\n", " batchCodeTable = createBatchCodeTable(\n", " filterDataFrame(\n", - " createDataFrameFromDescrs(\n", + " VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " VaersDescrReader(\"VAERS\").readAllVaersDescrs()),\n", " manufacturer = manufacturer,\n", " dose = '1'))\n", @@ -520,7 +526,7 @@ "def saveSevereEffectsBatchCodeTable(excelFile):\n", " severeEffectsBatchCodeTable = createSevereEffectsBatchCodeTable(\n", " filterDataFrameForSevereEffects(\n", - " createDataFrameFromDescrs(\n", + " VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " VaersDescrReader(\"VAERS\").readAllVaersDescrs()),\n", " dose = '1'))\n", " display('severeEffectsBatchCodeTable', severeEffectsBatchCodeTable)\n",