refactoring

This commit is contained in:
frankknoll
2022-02-05 19:32:27 +01:00
parent f75546355c
commit c4f1ac726c

View File

@@ -261,21 +261,20 @@
" \n", " \n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseTable(dataFrame):\n", " def getDoseTable(dataFrame):\n",
" doseTable = DoseAnalysis._getDoseTable(dataFrame.groupby('VAX_DOSE_SERIES'))\n", " return DoseAnalysis._getDoseTable(\n",
" doseTable.index.set_names('Dose', inplace = True)\n", " dataFrame.groupby(\n",
" return doseTable\n", " dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseByMonthTable(dataFrame):\n", " def getDoseByMonthTable(dataFrame):\n",
" # https://stackoverflow.com/questions/61879166/pandas-groupby-month-and-year-date-as-datetime64ns-and-summarized-by-count\n", " # https://stackoverflow.com/questions/61879166/pandas-groupby-month-and-year-date-as-datetime64ns-and-summarized-by-count\n",
" doseByMonthTable = DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" dataFrame.groupby(\n", " dataFrame.groupby(\n",
" [\n", " [\n",
" dataFrame['RECVDATE'].dt.year.rename('Year'),\n", " dataFrame['RECVDATE'].dt.year.rename('Year'),\n",
" dataFrame['RECVDATE'].dt.month.rename('Month'),\n", " dataFrame['RECVDATE'].dt.month.rename('Month'),\n",
" dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n",
" ]))\n", " ]))\n",
" return doseByMonthTable\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def _getDoseTable(dataFrame):\n", " def _getDoseTable(dataFrame):\n",
@@ -791,14 +790,6 @@
"doseByMonthTable.to_excel('results/doseByMonthTable.xlsx')\n", "doseByMonthTable.to_excel('results/doseByMonthTable.xlsx')\n",
"doseByMonthTable" "doseByMonthTable"
] ]
},
{
"cell_type": "code",
"execution_count": null,
"id": "8f915532",
"metadata": {},
"outputs": [],
"source": []
} }
], ],
"metadata": { "metadata": {