diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index fa297c545a9..a6099f3ce51 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -332,8 +332,8 @@ " \n", " @staticmethod\n", " def addCountryColumn(dataFrame):\n", - " dataFrame['Country'] = CountryColumnAdder.getCountryColumn(dataFrame)\n", - " return dataFrame.astype({'Country': \"string\"})\n", + " dataFrame['COUNTRY'] = CountryColumnAdder.getCountryColumn(dataFrame)\n", + " return dataFrame.astype({'COUNTRY': \"string\"})\n", "\n", " @staticmethod\n", " def getCountryColumn(dataFrame):\n", @@ -422,7 +422,7 @@ " return self.batchCodeTableByCountryFactory.createBatchCodeTableByCountry(country)\n", "\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", " self.dataFrame.groupby(\n", " [\n", - " self.dataFrame['Country'],\n", + " self.dataFrame['COUNTRY'],\n", " self.dataFrame['VAX_LOT']\n", " ]))\n", "\n", @@ -1124,7 +1124,7 @@ " def test_createInternationalLotTable(self):\n", " # Given\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", " [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", @@ -1156,12 +1156,12 @@ " 'United Kingdom',\n", " 'Unknown Country'\n", " ],\n", - " name = 'Country')))\n", + " name = 'COUNTRY')))\n", "\n", " def test_createBatchCodeTableByCountry(self):\n", " # Given\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", " [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", @@ -1195,7 +1195,7 @@ " def test_createBatchCodeTableByNonExistingCountry(self):\n", " # Given\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", " [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", @@ -1245,7 +1245,7 @@ "def getVaersForYears(years):\n", " vaersDescrs = _getVaersDescrReader().readVaersDescrsForYears(years)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame['Country'] = 'United States'\n", + " dataFrame['COUNTRY'] = 'United States'\n", " DataFrameNormalizer.normalize(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " return dataFrame\n", @@ -1492,7 +1492,7 @@ "metadata": {}, "outputs": [], "source": [ - "countries = sorted(internationalVaers['Country'].unique())" + "countries = sorted(internationalVaers['COUNTRY'].unique())" ] }, {