From 41a3c2ed3dec24cd84f0446fffe43d299eefdcef Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sat, 5 Feb 2022 20:18:55 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 7526e5da795..20813d4b618 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -128,11 +128,11 @@ " def __init__(self, dataFrame):\n", " self.dataFrame = dataFrame\n", "\n", - " def filterBy(self, manufacturer = None, dose = None):\n", + " def filterByCovid19And(self, manufacturer = None, dose = None):\n", " return self.dataFrame[self._isCovid19() & self._isManufacturer(manufacturer) & self._isDose(dose)]\n", "\n", " def filterForSevereEffects(self, dose):\n", - " return self.filterBy(dose = dose)\n", + " return self.filterByCovid19And(dose = dose)\n", "\n", " def _isCovid19(self):\n", " return self.dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n", @@ -240,7 +240,7 @@ "\n", " @staticmethod\n", " def createBatchCodeTable(dataFrame : pd.DataFrame, manufacturer, dose):\n", - " filteredDataFrame = DataFrameFilter(dataFrame).filterBy(manufacturer = manufacturer, dose = dose)\n", + " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And(manufacturer = manufacturer, dose = dose)\n", " return BatchCodeTableHelper(filteredDataFrame).createBatchCodeTable()\n", "\n", " # create table from https://www.howbadismybatch.com/combined.html\n", @@ -317,7 +317,7 @@ "\n", "class DataFrameFilterTest(unittest.TestCase):\n", "\n", - " def test_filterBy(self):\n", + " def test_filterByCovid19And(self):\n", " # Given\n", " dataFrameFilter = DataFrameFilter(\n", " VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", @@ -359,7 +359,7 @@ " ]))\n", " \n", " # When\n", - " dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n", + " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -435,7 +435,7 @@ " ]))\n", " \n", " # When\n", - " dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n", + " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '1')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n", @@ -469,7 +469,7 @@ " ]))\n", "\n", " # When\n", - " dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '2')\n", + " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '2')\n", " \n", " # Then\n", " dataFrameExpected = self.createDataFrame(\n",