refactoring

This commit is contained in:
frankknoll
2022-02-22 10:31:20 +01:00
parent 52845ca12d
commit 6087c2587e

View File

@@ -249,19 +249,20 @@
"source": [ "source": [
"class CompanyColumnAdder:\n", "class CompanyColumnAdder:\n",
" \n", " \n",
" @staticmethod\n", " def __init__(self, dataFrame_VAX_LOT_VAX_MANU):\n",
" def addCompanyColumn(batchCodeTable, companyByBatchCodeTable):\n", " self.dataFrame_VAX_LOT_VAX_MANU = dataFrame_VAX_LOT_VAX_MANU\n",
"\n",
" def addCompanyColumn(self, batchCodeTable):\n",
" return pd.merge(\n", " return pd.merge(\n",
" batchCodeTable,\n", " batchCodeTable,\n",
" companyByBatchCodeTable,\n", " self._createCompanyByBatchCodeTable(),\n",
" how = 'left',\n", " how = 'left',\n",
" left_index = True,\n", " left_index = True,\n",
" right_index = True,\n", " right_index = True,\n",
" validate = 'one_to_one')\n", " validate = 'one_to_one')\n",
"\n", "\n",
" @staticmethod\n", " def _createCompanyByBatchCodeTable(self):\n",
" def createCompanyByBatchCodeTable(dataFrame):\n", " manufacturerByBatchCodeTable = self.dataFrame_VAX_LOT_VAX_MANU[['VAX_LOT', 'VAX_MANU']]\n",
" manufacturerByBatchCodeTable = dataFrame[['VAX_LOT', 'VAX_MANU']]\n",
" manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.drop_duplicates(subset = ['VAX_LOT'])\n", " manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.drop_duplicates(subset = ['VAX_LOT'])\n",
" manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.set_index('VAX_LOT')\n", " manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.set_index('VAX_LOT')\n",
" return manufacturerByBatchCodeTable.rename(columns = {\"VAX_MANU\": \"Company\"})" " return manufacturerByBatchCodeTable.rename(columns = {\"VAX_MANU\": \"Company\"})"
@@ -278,6 +279,7 @@
"\n", "\n",
" def __init__(self, dataFrame: pd.DataFrame):\n", " def __init__(self, dataFrame: pd.DataFrame):\n",
" self.dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " self.dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" self.companyColumnAdder = CompanyColumnAdder(self.dataFrame)\n",
" self.countryBatchCodeTable = SummationTableFactory.createSummationTable(\n", " self.countryBatchCodeTable = SummationTableFactory.createSummationTable(\n",
" self.dataFrame.groupby(\n", " self.dataFrame.groupby(\n",
" [\n", " [\n",
@@ -292,9 +294,7 @@
" return self._postProcess(self._getBatchCodeTableByCountry(country))\n", " return self._postProcess(self._getBatchCodeTableByCountry(country))\n",
"\n", "\n",
" def _postProcess(self, batchCodeTable):\n", " def _postProcess(self, batchCodeTable):\n",
" batchCodeTable = CompanyColumnAdder.addCompanyColumn(\n", " batchCodeTable = self.companyColumnAdder.addCompanyColumn(batchCodeTable)\n",
" batchCodeTable,\n",
" CompanyColumnAdder.createCompanyByBatchCodeTable(self.dataFrame))\n",
" batchCodeTable = batchCodeTable[\n", " batchCodeTable = batchCodeTable[\n",
" [\n", " [\n",
" 'Adverse Reaction Reports',\n", " 'Adverse Reaction Reports',\n",
@@ -727,14 +727,6 @@
" country = 'Global',\n", " country = 'Global',\n",
" minADRsForLethality = minADRsForLethality)" " minADRsForLethality = minADRsForLethality)"
] ]
},
{
"cell_type": "code",
"execution_count": null,
"id": "258adf58",
"metadata": {},
"outputs": [],
"source": []
} }
], ],
"metadata": { "metadata": {