refactoring
This commit is contained in:
@@ -283,13 +283,13 @@
|
||||
"class BatchCodeTableFactory:\n",
|
||||
"\n",
|
||||
" def __init__(self, dataFrame: pd.DataFrame):\n",
|
||||
" self.dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
|
||||
" self.companyColumnAdder = CompanyColumnAdder(self.dataFrame)\n",
|
||||
" self.dataFrame = dataFrame\n",
|
||||
" self.companyColumnAdder = CompanyColumnAdder(dataFrame)\n",
|
||||
" self.countryBatchCodeTable = SummationTableFactory.createSummationTable(\n",
|
||||
" self.dataFrame.groupby(\n",
|
||||
" dataFrame.groupby(\n",
|
||||
" [\n",
|
||||
" self.dataFrame['COUNTRY'],\n",
|
||||
" self.dataFrame['VAX_LOT']\n",
|
||||
" dataFrame['COUNTRY'],\n",
|
||||
" dataFrame['VAX_LOT']\n",
|
||||
" ]))\n",
|
||||
"\n",
|
||||
" def createGlobalBatchCodeTable(self):\n",
|
||||
@@ -692,7 +692,8 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"internationalVaers = pd.concat([getVaersForYears([2020, 2021, 2022]), getNonDomesticVaers()])\n",
|
||||
"internationalVaers"
|
||||
"internationalVaersCovid19 = DataFrameFilter().filterByCovid19(internationalVaers)\n",
|
||||
"internationalVaersCovid19"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -738,7 +739,7 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"countries = sorted(internationalVaers['COUNTRY'].unique())\n",
|
||||
"countries = sorted(internationalVaersCovid19['COUNTRY'].unique())\n",
|
||||
"printCountryOptions(countries)"
|
||||
]
|
||||
},
|
||||
@@ -750,7 +751,7 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"minADRsForLethality = 100\n",
|
||||
"batchCodeTableFactory = BatchCodeTableFactory(internationalVaers)\n",
|
||||
"batchCodeTableFactory = BatchCodeTableFactory(internationalVaersCovid19)\n",
|
||||
"\n",
|
||||
"createAndSaveBatchCodeTablesForCountries(\n",
|
||||
" createBatchCodeTableForCountry = lambda country: batchCodeTableFactory.createBatchCodeTableByCountry(country),\n",
|
||||
|
||||
Reference in New Issue
Block a user