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:13:38 +01:00
parent 90d26d518d
commit 6c9755ad62
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
HowBadIsMyBatch.ipynb
View File

@@ -125,11 +125,14 @@
"\n",
"class DataFrameFilter:\n",
" \n",
" def filterByCovid19And(self, dataFrame, manufacturer = None, dose = None):\n",
" return dataFrame[self._isCovid19(dataFrame) & self._isManufacturer(dataFrame, manufacturer) & self._isDose(dataFrame, dose)]\n",
" def filterByCovid19(self, dataFrame):\n",
" return dataFrame[self._isCovid19(dataFrame)]\n",
"\n",
" 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.filterByCovid19And(dataFrame, dose = dose)\n",
" return self.filterBy(self.filterByCovid19(dataFrame), dose = dose)\n",
"\n",
" def _isCovid19(self, dataFrame):\n",
" return dataFrame[\"VAX_TYPE\"] == \"COVID19\"\n",
@@ -237,7 +240,8 @@
"\n",
" @staticmethod\n",
" def createBatchCodeTable(dataFrame : pd.DataFrame, manufacturer, dose):\n",
" filteredDataFrame = DataFrameFilter().filterByCovid19And(dataFrame, manufacturer = manufacturer, dose = dose)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" filteredDataFrame = DataFrameFilter().filterBy(dataFrame, manufacturer = manufacturer, dose = dose)\n",
" return BatchCodeTableHelper(filteredDataFrame).createBatchCodeTable()\n",
"\n",
" # create table from https://www.howbadismybatch.com/combined.html\n",
@@ -313,7 +317,7 @@
"\n",
"class DataFrameFilterTest(unittest.TestCase):\n",
"\n",
" def test_filterByCovid19And(self):\n",
" def test_filterByCovid19_filterBy(self):\n",
" # Given\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n",
@@ -355,7 +359,8 @@
" dataFrameFilter = DataFrameFilter()\n",
" \n",
" # When\n",
" dataFrame = dataFrameFilter.filterByCovid19And(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" dataFrame = dataFrameFilter.filterByCovid19(dataFrame)\n",
" dataFrame = dataFrameFilter.filterBy(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -431,7 +436,8 @@
" dataFrameFilter = DataFrameFilter()\n",
" \n",
" # When\n",
" dataFrame = dataFrameFilter.filterByCovid19And(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" dataFrame = dataFrameFilter.filterByCovid19(dataFrame)\n",
" dataFrame = dataFrameFilter.filterBy(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -465,7 +471,8 @@
" dataFrameFilter = DataFrameFilter()\n",
"\n",
" # When\n",
" dataFrame = dataFrameFilter.filterByCovid19And(dataFrame, manufacturer = \"MODERNA\", dose = '2')\n",
" dataFrame = dataFrameFilter.filterByCovid19(dataFrame)\n",
" dataFrame = dataFrameFilter.filterBy(dataFrame, manufacturer = \"MODERNA\", dose = '2')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -618,7 +625,7 @@
" \"1048786\",\n",
" \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter().filterByCovid19And(dataFrame)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" \n",
" # When\n",
" doseTable = DoseAnalysis.getDoseTable(dataFrame)\n",
@@ -649,7 +656,7 @@
" \"1048786\",\n",
" \"4711\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" dataFrame = DataFrameFilter().filterByCovid19And(dataFrame)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" \n",
" # When\n",
" doseByMonthTable = DoseAnalysis.getDoseByMonthTable(dataFrame)\n",
@@ -812,13 +819,13 @@
"def getDoseTable():\n",
" vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame = DataFrameFilter().filterByCovid19And(dataFrame)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis.getDoseTable(dataFrame)\n",
"\n",
"def getDoseByMonthTable():\n",
" vaersDescrs = VaersDescrReader(dataDir = \"VAERS\").readAllVaersDescrs()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame = DataFrameFilter().filterByCovid19And(dataFrame)\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" return DoseAnalysis.getDoseByMonthTable(dataFrame)"
]
},