francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-02-05 20:18:55 +01:00
parent ddffbe8b44
commit 41a3c2ed3d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HowBadIsMyBatch.ipynb
View File

@@ -128,11 +128,11 @@
" def __init__(self, dataFrame):\n", " def __init__(self, dataFrame):\n",
" self.dataFrame = dataFrame\n", " self.dataFrame = dataFrame\n",
"\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", " return self.dataFrame[self._isCovid19() & self._isManufacturer(manufacturer) & self._isDose(dose)]\n",
"\n", "\n",
" def filterForSevereEffects(self, dose):\n", " def filterForSevereEffects(self, dose):\n",
" return self.filterBy(dose = dose)\n", " return self.filterByCovid19And(dose = dose)\n",
"\n", "\n",
" def _isCovid19(self):\n", " def _isCovid19(self):\n",
" return self.dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n", " return self.dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n",
@@ -240,7 +240,7 @@
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def createBatchCodeTable(dataFrame : pd.DataFrame, manufacturer, dose):\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", " return BatchCodeTableHelper(filteredDataFrame).createBatchCodeTable()\n",
"\n", "\n",
" # create table from https://www.howbadismybatch.com/combined.html\n", " # create table from https://www.howbadismybatch.com/combined.html\n",
@@ -317,7 +317,7 @@
"\n", "\n",
"class DataFrameFilterTest(unittest.TestCase):\n", "class DataFrameFilterTest(unittest.TestCase):\n",
"\n", "\n",
" def test_filterBy(self):\n", " def test_filterByCovid19And(self):\n",
" # Given\n", " # Given\n",
" dataFrameFilter = DataFrameFilter(\n", " dataFrameFilter = DataFrameFilter(\n",
" VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
@@ -359,7 +359,7 @@
" ]))\n", " ]))\n",
" \n", " \n",
" # When\n", " # When\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n", " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '1')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",
@@ -435,7 +435,7 @@
" ]))\n", " ]))\n",
" \n", " \n",
" # When\n", " # When\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n", " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '1')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",
@@ -469,7 +469,7 @@
" ]))\n", " ]))\n",
"\n", "\n",
" # When\n", " # When\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '2')\n", " dataFrame = dataFrameFilter.filterByCovid19And(manufacturer = \"MODERNA\", dose = '2')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",