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-06 11:27:15 +01:00
parent 6c9755ad62
commit 4ba08fcf1d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HowBadIsMyBatch.ipynb
View File

@@ -131,9 +131,6 @@
" def filterBy(self, dataFrame, manufacturer = None, dose = None):\n", " def filterBy(self, dataFrame, manufacturer = None, dose = None):\n",
" return dataFrame[self._isManufacturer(dataFrame, manufacturer) & self._isDose(dataFrame, dose)]\n", " return dataFrame[self._isManufacturer(dataFrame, manufacturer) & self._isDose(dataFrame, dose)]\n",
"\n", "\n",
" def filterForSevereEffects(self, dataFrame, dose):\n",
" return self.filterBy(self.filterByCovid19(dataFrame), dose = dose)\n",
"\n",
" def _isCovid19(self, dataFrame):\n", " def _isCovid19(self, dataFrame):\n",
" return dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n", " return dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n",
"\n", "\n",
@@ -247,8 +244,9 @@
" # create table from https://www.howbadismybatch.com/combined.html\n", " # create table from https://www.howbadismybatch.com/combined.html\n",
" @staticmethod\n", " @staticmethod\n",
" def createSevereEffectsBatchCodeTable(dataFrame : pd.DataFrame, dose):\n", " def createSevereEffectsBatchCodeTable(dataFrame : pd.DataFrame, dose):\n",
" severeEffectsDataFrame = DataFrameFilter().filterForSevereEffects(dataFrame, dose)\n", " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return BatchCodeTableHelper(severeEffectsDataFrame).createSevereEffectsBatchCodeTable()\n" " dataFrame = DataFrameFilter().filterBy(dataFrame, dose = dose)\n",
" return BatchCodeTableHelper(dataFrame).createSevereEffectsBatchCodeTable()\n"
] ]
}, },
{ {
@@ -375,7 +373,7 @@
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n", " assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n",
"\n", "\n",
" def test_filterForSevereEffects(self):\n", " def test_filterByDose(self):\n",
" # Given\n", " # Given\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n", " [\n",
@@ -398,9 +396,10 @@
" }\n", " }\n",
" ])\n", " ])\n",
" dataFrameFilter = DataFrameFilter()\n", " dataFrameFilter = DataFrameFilter()\n",
" dataFrame = dataFrameFilter.filterByCovid19(dataFrame)\n",
"\n", "\n",
" # When\n", " # When\n",
" dataFrame = dataFrameFilter.filterForSevereEffects(dataFrame, dose = '1')\n", " dataFrame = dataFrameFilter.filterBy(dataFrame, dose = '1')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",