From bc0515ca17d161138d59f349382babfa7b5e58a3 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Sat, 26 Mar 2022 17:20:58 +0100
Subject: [PATCH] refactoring

---
 src/intensivstationen/Intensivstationen.ipynb | 49 +++----------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb
index 700d70aacc8..e18cc56da7b 100644
--- a/src/intensivstationen/Intensivstationen.ipynb
+++ b/src/intensivstationen/Intensivstationen.ipynb
@@ -266,11 +266,15 @@
     "        self.kreise = kreise\n",
     "\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['Kreis'] = dataFrame_kreise['Kreis']\n",
     "        dataFrame['Einwohnerzahl'] = dataFrame_kreise['Einwohnerzahl']\n",
-    "        return self._addBundeslandColumn(dataFrame)\n",
-    "        \n",
+    "        return dataFrame\n",
+    "\n",
     "    def _addBundeslandColumn(self, dataFrame):\n",
     "        return pd.merge(\n",
     "            dataFrame,\n",
@@ -694,26 +698,6 @@
     "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",
    "execution_count": null,
@@ -721,26 +705,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "medianOfFreeBedsByKreisTable = ColumnsAdder2(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3658bea0",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "medianOfFreeBedsByKreisTable"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d994f8d6",
-   "metadata": {},
-   "outputs": [],
-   "source": [
+    "medianOfFreeBedsByKreisTable = ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
     "medianOfFreeBedsByKreisTable.to_excel('medianOfFreeBedsByKreisTable.xlsx')"
    ]
   },