refactoring

This commit is contained in:
frankknoll
2022-02-07 14:04:21 +01:00
parent 4dbc7f39e9
commit a06ce06479

View File

@@ -196,11 +196,6 @@
" def __init__(self, dataFrame : pd.DataFrame):\n",
" self.dataFrame = dataFrame\n",
"\n",
" def createBatchCodeTable(self):\n",
" batchCodeTable = BatchCodeTableHelper._createSevereEffectsBatchCodeTable(self.dataFrame.groupby('VAX_LOT'))\n",
" batchCodeTable = batchCodeTable[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES']]\n",
" return batchCodeTable.sort_values(by = 'ADRs', ascending = False)\n",
"\n",
" # create table from https://www.howbadismybatch.com/combined.html\n",
" def createSevereEffectsBatchCodeTable(self):\n",
" batchCodeTable = BatchCodeTableHelper._createSevereEffectsBatchCodeTable(self.dataFrame.groupby('VAX_LOT'))\n",
@@ -255,7 +250,7 @@
" def createBatchCodeTable(dataFrame : pd.DataFrame, manufacturer, dose):\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" dataFrame = DataFrameFilter().filterBy(dataFrame, manufacturer = manufacturer, dose = dose)\n",
" return BatchCodeTableHelper(dataFrame).createBatchCodeTable()\n",
" return BatchCodeTableHelper(dataFrame).createSevereEffectsBatchCodeTable()[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES']]\n",
"\n",
" # create table from https://www.howbadismybatch.com/combined.html\n",
" @staticmethod\n",