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 22:51:36 +01:00
parent 256ccd926d
commit 1e7e859f9c
2 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intensivstationen/IntensiveCareBedsProvider.py Normal file
View File

@@ -0,0 +1,12 @@
import pandas as pd
def getIntensiveCareBeds(timeSeries, kreis = None):
if kreis is not None:
return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei', 'Einwohnerzahl']]
else:
return timeSeries.groupby('date').agg(**{
'betten_belegt': pd.NamedAgg(column = 'betten_belegt', aggfunc = 'sum'),
'betten_frei': pd.NamedAgg(column = 'betten_frei', aggfunc = 'sum'),
'Einwohnerzahl': pd.NamedAgg(column = 'Einwohnerzahl', aggfunc = 'sum')
}).reset_index()

54
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -33,6 +33,7 @@
"from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n", "from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n",
"from KreiseReader import readKreise\n", "from KreiseReader import readKreise\n",
"from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n", "from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n",
"from IntensiveCareBedsProvider import getIntensiveCareBeds\n",
"\n", "\n",
"\n", "\n",
"pd.set_option('display.max_rows', 100)\n", "pd.set_option('display.max_rows', 100)\n",
@@ -81,18 +82,9 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"kreise = readKreise(download = False)\n",
"timeSeries = readTimeseries(download = needsUpdate)\n", "timeSeries = readTimeseries(download = needsUpdate)\n",
"timeSeries" "timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "62a20115",
"metadata": {},
"outputs": [],
"source": [
"timeSeries = ColumnsAdder(kreise = readKreise(download = False)).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
"timeSeries" "timeSeries"
] ]
}, },
@@ -103,47 +95,11 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"kreisValues = sorted(timeSeries['Kreis'].drop_duplicates().values)" "kreisValues = sorted(timeSeries['Kreis'].drop_duplicates().values)\n",
] "kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues)\n",
},
{
"cell_type": "code",
"execution_count": null,
"id": "9c38ca16",
"metadata": {},
"outputs": [],
"source": [
"kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5dd8d864",
"metadata": {},
"outputs": [],
"source": [
"saveKreisOptions(kreisOptions, toHtmlFile = \"../../docs/intensivstationen.html\")" "saveKreisOptions(kreisOptions, toHtmlFile = \"../../docs/intensivstationen.html\")"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "997a4bdb",
"metadata": {},
"outputs": [],
"source": [
"def getIntensiveCareBeds(timeSeries, kreis = None):\n",
" if kreis is not None:\n",
" return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei', 'Einwohnerzahl']]\n",
" else:\n",
" return timeSeries.groupby('date').agg(**{\n",
" 'betten_belegt': pd.NamedAgg(column = 'betten_belegt', aggfunc = 'sum'),\n",
" 'betten_frei': pd.NamedAgg(column = 'betten_frei', aggfunc = 'sum'),\n",
" 'Einwohnerzahl': pd.NamedAgg(column = 'Einwohnerzahl', aggfunc = 'sum')\n",
" }).reset_index()"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,