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-12-14 23:45:55 +01:00
parent 4472406eb5
commit b4bb79efdf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -81,10 +81,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"kreise = readKreise(download = False)\n", "timeSeries = readTimeseries(download = needsUpdate)"
"timeSeries = readTimeseries(download = needsUpdate)\n",
"timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
"timeSeries"
] ]
}, },
{ {
@@ -133,7 +130,7 @@
"source": [ "source": [
"def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n", "def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n",
" medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n", " medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
" return ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n", " return ColumnsAdder(readKreise()).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
" \n", " \n",
"medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)" "medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
] ]

8
src/intensivstationen/TimeseriesReader.py
View File

@@ -1,8 +1,14 @@
import pandas as pd import pandas as pd
from urllib import request from urllib import request
from ColumnsAdder import ColumnsAdder
from KreiseReader import readKreise
def readTimeseries(download = False): def readTimeseries(download = False):
timeSeries = _readTimeseries(download = download)
timeSeries = ColumnsAdder(readKreise()).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)
return timeSeries
def _readTimeseries(download = False):
timeSeriesFile = 'zeitreihe-tagesdaten.csv' timeSeriesFile = 'zeitreihe-tagesdaten.csv'
if download: if download:
_downloadTimeseries(timeSeriesFile) _downloadTimeseries(timeSeriesFile)