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-20 17:32:29 +01:00
parent aa18911c32
commit 9d44215c37
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/HowBadIsMyBatch.ipynb
View File

@@ -412,13 +412,34 @@
" \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.countryBatchCodeTable = None\n", " self.batchCodeTableByCountryFactory = BatchCodeTableByCountryFactory(dataFrame)\n",
"\n", "\n",
" def createInternationalLotTable(self):\n", " def createInternationalLotTable(self):\n",
" internationalLotTable = self._createInternationalLotTable()\n", " internationalLotTable = self._createInternationalLotTable()\n",
" return internationalLotTable.sort_values(by = 'Severe reports', ascending = False)\n", " return internationalLotTable.sort_values(by = 'Severe reports', ascending = False)\n",
"\n", "\n",
" # FK-TODO: move this and dependent methods to another class\n", " def createBatchCodeTableByCountry(self, country):\n",
" return self.batchCodeTableByCountryFactory.createBatchCodeTableByCountry(country)\n",
"\n",
" def _createInternationalLotTable(self):\n",
" countryColumnName = 'Country'\n",
" dataFrame = CountryColumnAdder.addCountryColumn(self.dataFrame, countryColumnName = countryColumnName)\n",
" return SummationTableFactory.createSummationTableHavingSevereReportsColumn(dataFrame.groupby(dataFrame[countryColumnName]))\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "71456a79",
"metadata": {},
"outputs": [],
"source": [
"class BatchCodeTableByCountryFactory:\n",
"\n",
" def __init__(self, dataFrame : pd.DataFrame):\n",
" self.dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" self.countryBatchCodeTable = None\n",
"\n",
" def createBatchCodeTableByCountry(self, country):\n", " def createBatchCodeTableByCountry(self, country):\n",
" batchCodeTable = self._createBatchCodeTableByCountry(country)\n", " batchCodeTable = self._createBatchCodeTableByCountry(country)\n",
" batchCodeTable = CompanyColumnAdder.addCompanyColumn(batchCodeTable, CompanyColumnAdder.createCompanyByBatchCodeTable(self.dataFrame))\n", " batchCodeTable = CompanyColumnAdder.addCompanyColumn(batchCodeTable, CompanyColumnAdder.createCompanyByBatchCodeTable(self.dataFrame))\n",
@@ -434,11 +455,6 @@
" ]]\n", " ]]\n",
" return batchCodeTable.sort_values(by = 'Severe reports', ascending = False)\n", " return batchCodeTable.sort_values(by = 'Severe reports', ascending = False)\n",
"\n", "\n",
" def _createInternationalLotTable(self):\n",
" countryColumnName = 'Country'\n",
" dataFrame = CountryColumnAdder.addCountryColumn(self.dataFrame, countryColumnName = countryColumnName)\n",
" return SummationTableFactory.createSummationTableHavingSevereReportsColumn(dataFrame.groupby(dataFrame[countryColumnName]))\n",
"\n",
" def _createBatchCodeTableByCountry(self, country):\n", " def _createBatchCodeTableByCountry(self, country):\n",
" if self.countryBatchCodeTable is None:\n", " if self.countryBatchCodeTable is None:\n",
" self.countryBatchCodeTable = self._getCountryBatchCodeTable()\n", " self.countryBatchCodeTable = self._getCountryBatchCodeTable()\n",
@@ -458,7 +474,9 @@
" return countryBatchCodeTable.loc[country] if country in countryBatchCodeTable.index else self._getEmptyBatchCodeTable(countryBatchCodeTable)\n", " return countryBatchCodeTable.loc[country] if country in countryBatchCodeTable.index else self._getEmptyBatchCodeTable(countryBatchCodeTable)\n",
" \n", " \n",
" def _getEmptyBatchCodeTable(self, countryBatchCodeTable):\n", " def _getEmptyBatchCodeTable(self, countryBatchCodeTable):\n",
" return countryBatchCodeTable[0:0].droplevel(0)\n" " return countryBatchCodeTable[0:0].droplevel(0)\n",
"\n",
" "
] ]
}, },
{ {