diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index ec135989ac0..c21ba2622c6 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -261,18 +261,21 @@ " \n", " @staticmethod\n", " def getDoseTable(dataFrame):\n", - " return DoseAnalysis._getDoseTable(dataFrame.groupby('VAX_DOSE_SERIES'))\n", + " doseTable = DoseAnalysis._getDoseTable(dataFrame.groupby('VAX_DOSE_SERIES'))\n", + " doseTable.index.set_names('Dose', inplace = True)\n", + " return doseTable\n", "\n", " @staticmethod\n", " def getDoseByMonthTable(dataFrame):\n", " # https://stackoverflow.com/questions/61879166/pandas-groupby-month-and-year-date-as-datetime64ns-and-summarized-by-count\n", - " return DoseAnalysis._getDoseTable(\n", + " doseByMonthTable = DoseAnalysis._getDoseTable(\n", " dataFrame.groupby(\n", " [\n", - " dataFrame['RECVDATE'].dt.year.rename('year'),\n", - " dataFrame['RECVDATE'].dt.month.rename('month'),\n", - " dataFrame['VAX_DOSE_SERIES']\n", + " dataFrame['RECVDATE'].dt.year.rename('Year'),\n", + " dataFrame['RECVDATE'].dt.month.rename('Month'),\n", + " dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " ]))\n", + " return doseByMonthTable\n", "\n", " @staticmethod\n", " def _getDoseTable(dataFrame):\n", @@ -635,7 +638,7 @@ " 'Life Threatening Illnesses': [1, 0],\n", " 'Severe reports (%)': [(2 + 1 + 1)/2 * 100, (1 + 0 + 0)/1 * 100]\n", " },\n", - " index = pd.Index(['1', '2'], dtype = \"string\", name = 'VAX_DOSE_SERIES')))\n", + " index = pd.Index(['1', '2'], dtype = \"string\", name = 'Dose')))\n", " \n", " def test_getDoseByMonthTable(self):\n", " # Given\n", @@ -670,7 +673,7 @@ " (2021, 1, '1'),\n", " (2021, 1, '2'),\n", " ],\n", - " names = ('year', 'month', 'VAX_DOSE_SERIES'))),\n", + " names = ('Year', 'Month', 'Dose'))),\n", " check_index_type = False)\n", "\n", " def createDataFrame(self, index, columns, data, dtypes = {}):\n", @@ -788,6 +791,14 @@ "doseByMonthTable.to_excel('results/doseByMonthTable.xlsx')\n", "doseByMonthTable" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "8f915532", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": {