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 19:01:25 +01:00
parent be1f4e613e
commit 48befecfd3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/HowBadIsMyBatch.ipynb
View File

@@ -332,8 +332,8 @@
" \n", " \n",
" @staticmethod\n", " @staticmethod\n",
" def addCountryColumn(dataFrame):\n", " def addCountryColumn(dataFrame):\n",
" dataFrame['Country'] = CountryColumnAdder.getCountryColumn(dataFrame)\n", " dataFrame['COUNTRY'] = CountryColumnAdder.getCountryColumn(dataFrame)\n",
" return dataFrame.astype({'Country': \"string\"})\n", " return dataFrame.astype({'COUNTRY': \"string\"})\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def getCountryColumn(dataFrame):\n", " def getCountryColumn(dataFrame):\n",
@@ -422,7 +422,7 @@
" return self.batchCodeTableByCountryFactory.createBatchCodeTableByCountry(country)\n", " return self.batchCodeTableByCountryFactory.createBatchCodeTableByCountry(country)\n",
"\n", "\n",
" def _createInternationalLotTable(self):\n", " def _createInternationalLotTable(self):\n",
" return SummationTableFactory.createSummationTableHavingSevereReportsColumn(self.dataFrame.groupby(self.dataFrame['Country']))\n" " return SummationTableFactory.createSummationTableHavingSevereReportsColumn(self.dataFrame.groupby(self.dataFrame['COUNTRY']))\n"
] ]
}, },
{ {
@@ -462,7 +462,7 @@
" return SummationTableFactory.createSummationTableHavingSevereReportsColumn(\n", " return SummationTableFactory.createSummationTableHavingSevereReportsColumn(\n",
" self.dataFrame.groupby(\n", " self.dataFrame.groupby(\n",
" [\n", " [\n",
" self.dataFrame['Country'],\n", " self.dataFrame['COUNTRY'],\n",
" self.dataFrame['VAX_LOT']\n", " self.dataFrame['VAX_LOT']\n",
" ]))\n", " ]))\n",
"\n", "\n",
@@ -1124,7 +1124,7 @@
" def test_createInternationalLotTable(self):\n", " def test_createInternationalLotTable(self):\n",
" # Given\n", " # Given\n",
" dataFrame = TestHelper.createDataFrame(\n", " dataFrame = TestHelper.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'Country'],\n", " columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'COUNTRY'],\n",
" data = [ [1, 0, 0, 'COVID19', 'MODERNA', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n", " data = [ [1, 0, 0, 'COVID19', 'MODERNA', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n",
" [1, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [1, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
" [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
@@ -1156,12 +1156,12 @@
" 'United Kingdom',\n", " 'United Kingdom',\n",
" 'Unknown Country'\n", " 'Unknown Country'\n",
" ],\n", " ],\n",
" name = 'Country')))\n", " name = 'COUNTRY')))\n",
"\n", "\n",
" def test_createBatchCodeTableByCountry(self):\n", " def test_createBatchCodeTableByCountry(self):\n",
" # Given\n", " # Given\n",
" dataFrame = TestHelper.createDataFrame(\n", " dataFrame = TestHelper.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'Country'],\n", " columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'COUNTRY'],\n",
" data = [ [1, 0, 0, 'COVID19', 'PFIZER\\BIONTECH', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n", " data = [ [1, 0, 0, 'COVID19', 'PFIZER\\BIONTECH', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n",
" [0, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [0, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
" [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
@@ -1195,7 +1195,7 @@
" def test_createBatchCodeTableByNonExistingCountry(self):\n", " def test_createBatchCodeTableByNonExistingCountry(self):\n",
" # Given\n", " # Given\n",
" dataFrame = TestHelper.createDataFrame(\n", " dataFrame = TestHelper.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'Country'],\n", " columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE', 'HOSPITAL', 'ER_VISIT', 'COUNTRY'],\n",
" data = [ [1, 0, 0, 'COVID19', 'PFIZER\\BIONTECH', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n", " data = [ [1, 0, 0, 'COVID19', 'PFIZER\\BIONTECH', '016M20A', '2', 'GBPFIZER INC2020486806', 0, 0, 'United Kingdom'],\n",
" [0, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [0, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
" [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n", " [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224', 0, 0, 'France'],\n",
@@ -1245,7 +1245,7 @@
"def getVaersForYears(years):\n", "def getVaersForYears(years):\n",
" vaersDescrs = _getVaersDescrReader().readVaersDescrsForYears(years)\n", " vaersDescrs = _getVaersDescrReader().readVaersDescrsForYears(years)\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" dataFrame['Country'] = 'United States'\n", " dataFrame['COUNTRY'] = 'United States'\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n", " return dataFrame\n",
@@ -1492,7 +1492,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"countries = sorted(internationalVaers['Country'].unique())" "countries = sorted(internationalVaers['COUNTRY'].unique())"
] ]
}, },
{ {