From 824be3fcadd005a159826f4dd0eb7ecb97992b02 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Thu, 3 Mar 2022 13:41:54 +0100 Subject: [PATCH] refactoring --- src/intensivstationen/Intensivstationen.ipynb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb index 16674bf7920..63d3a38b35e 100644 --- a/src/intensivstationen/Intensivstationen.ipynb +++ b/src/intensivstationen/Intensivstationen.ipynb @@ -226,30 +226,30 @@ "import json\n", "\n", "\n", - "def getAndPersistIntensiveCareBeds(timeSeries, kreis=None):\n", - " dataFrame = getIntensiveCareBeds(timeSeries, kreis)\n", + "def getAndPersistIntensiveCareBeds(timeSeries, kreis = None):\n", + " intensiveCareBeds = getIntensiveCareBeds(timeSeries, kreis)\n", " display(kreis)\n", - " _saveDataFrameAsJson(dataFrame, _getFilename(kreis))\n", - " return dataFrame\n", + " _saveAsJson(intensiveCareBeds, _getFilename(kreis))\n", + " return intensiveCareBeds\n", "\n", "\n", - "def _saveDataFrameAsJson(dataFrame, file):\n", + "def _saveAsJson(intensiveCareBeds, file):\n", " IOUtils.saveDictAsJson(\n", " {\n", - " 'population': int(dataFrame.iloc[0]['Einwohnerzahl']),\n", - " 'data': _dataFrame2Dict(dataFrame),\n", + " 'population': int(intensiveCareBeds.iloc[0]['Einwohnerzahl']),\n", + " 'data': _intensiveCareBeds2Dict(intensiveCareBeds),\n", " },\n", " file)\n", "\n", "\n", - "def _dataFrame2Dict(dataFrame):\n", - " df = dataFrame[['date', 'betten_belegt', 'betten_frei']]\n", + "def _intensiveCareBeds2Dict(intensiveCareBeds):\n", + " df = intensiveCareBeds[['date', 'betten_belegt', 'betten_frei']]\n", " df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n", - " return df.to_dict(orient=\"records\")\n", + " return df.to_dict(orient = \"records\")\n", "\n", "\n", "def _getFilename(kreis):\n", - " return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix=_getSuffix(kreis))\n", + " return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix = _getSuffix(kreis))\n", "\n", "\n", "def _getSuffix(kreis):\n",