From 4ba08fcf1d9bee255839a658fa4615c9ce64953f Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sun, 6 Feb 2022 11:27:15 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index a6af80f8c9d..e2b1a226229 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -131,9 +131,6 @@ " def filterBy(self, dataFrame, manufacturer = None, dose = None):\n", " return dataFrame[self._isManufacturer(dataFrame, manufacturer) & self._isDose(dataFrame, dose)]\n", "\n", - " def filterForSevereEffects(self, dataFrame, dose):\n", - " return self.filterBy(self.filterByCovid19(dataFrame), dose = dose)\n", - "\n", " def _isCovid19(self, dataFrame):\n", " return dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n", "\n", @@ -247,8 +244,9 @@ " # create table from https://www.howbadismybatch.com/combined.html\n", " @staticmethod\n", " def createSevereEffectsBatchCodeTable(dataFrame : pd.DataFrame, dose):\n", - " severeEffectsDataFrame = DataFrameFilter().filterForSevereEffects(dataFrame, dose)\n", - " return BatchCodeTableHelper(severeEffectsDataFrame).createSevereEffectsBatchCodeTable()\n" + " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", + " dataFrame = DataFrameFilter().filterBy(dataFrame, dose = dose)\n", + " return BatchCodeTableHelper(dataFrame).createSevereEffectsBatchCodeTable()\n" ] }, { @@ -375,7 +373,7 @@ " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n", "\n", - " def test_filterForSevereEffects(self):\n", + " def test_filterByDose(self):\n", " # Given\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " [\n", @@ -398,9 +396,10 @@ " }\n", " ])\n", " dataFrameFilter = DataFrameFilter()\n", + " dataFrame = dataFrameFilter.filterByCovid19(dataFrame)\n", "\n", " # When\n", - " dataFrame = dataFrameFilter.filterForSevereEffects(dataFrame, dose = '1')\n", + " dataFrame = dataFrameFilter.filterBy(dataFrame, dose = '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n",