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-03-26 17:20:58 +01:00
parent 4d4e1ce657
commit bc0515ca17
1 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -266,11 +266,15 @@
" self.kreise = kreise\n", " self.kreise = kreise\n",
"\n", "\n",
" def addKreisAndBundeslandAndEinwohnerzahlColumns(self, dataFrame):\n", " def addKreisAndBundeslandAndEinwohnerzahlColumns(self, dataFrame):\n",
" dataFrame = self.addKreisAndEinwohnerzahlColumns(dataFrame)\n",
" return self._addBundeslandColumn(dataFrame)\n",
" \n",
" def addKreisAndEinwohnerzahlColumns(self, dataFrame):\n",
" dataFrame_kreise = pd.merge(dataFrame, self.kreise, how = 'left', left_on = 'gemeindeschluessel', right_index = True)\n", " dataFrame_kreise = pd.merge(dataFrame, self.kreise, how = 'left', left_on = 'gemeindeschluessel', right_index = True)\n",
" dataFrame['Kreis'] = dataFrame_kreise['Kreis']\n", " dataFrame['Kreis'] = dataFrame_kreise['Kreis']\n",
" dataFrame['Einwohnerzahl'] = dataFrame_kreise['Einwohnerzahl']\n", " dataFrame['Einwohnerzahl'] = dataFrame_kreise['Einwohnerzahl']\n",
" return self._addBundeslandColumn(dataFrame)\n", " return dataFrame\n",
" \n", "\n",
" def _addBundeslandColumn(self, dataFrame):\n", " def _addBundeslandColumn(self, dataFrame):\n",
" return pd.merge(\n", " return pd.merge(\n",
" dataFrame,\n", " dataFrame,\n",
@@ -694,26 +698,6 @@
"medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTable.reset_index()" "medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTable.reset_index()"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "bc391168",
"metadata": {},
"outputs": [],
"source": [
"# FK-TODO: merge with ColumnsAdder\n",
"class ColumnsAdder2:\n",
"\n",
" def __init__(self, kreise):\n",
" self.kreise = kreise\n",
"\n",
" def addKreisAndBundeslandAndEinwohnerzahlColumns(self, dataFrame):\n",
" dataFrame_kreise = pd.merge(dataFrame, self.kreise, how = 'left', left_on = 'gemeindeschluessel', right_index = True)\n",
" dataFrame['Kreis'] = dataFrame_kreise['Kreis']\n",
" dataFrame['Einwohnerzahl'] = dataFrame_kreise['Einwohnerzahl']\n",
" return dataFrame"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
@@ -721,26 +705,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"medianOfFreeBedsByKreisTable = ColumnsAdder2(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)" "medianOfFreeBedsByKreisTable = ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "3658bea0",
"metadata": {},
"outputs": [],
"source": [
"medianOfFreeBedsByKreisTable"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "d994f8d6",
"metadata": {},
"outputs": [],
"source": [
"medianOfFreeBedsByKreisTable.to_excel('medianOfFreeBedsByKreisTable.xlsx')" "medianOfFreeBedsByKreisTable.to_excel('medianOfFreeBedsByKreisTable.xlsx')"
] ]
}, },