refactoring

This commit is contained in:
frankknoll
2022-02-25 19:05:17 +01:00
parent 8b916933e5
commit 3d5b8e32b5

View File

@@ -22,22 +22,19 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"def readTimeseries(bundesland = None):\n", "def readTimeseries(bundesland = None):\n",
" df = pd.read_csv(\n", " dataFrame = pd.read_csv(\n",
" 'intensivstationen/zeitreihe-bundeslaender.csv',\n", " 'intensivstationen/zeitreihe-bundeslaender.csv',\n",
" low_memory = False,\n", " low_memory = False,\n",
" parse_dates = ['Datum'],\n", " parse_dates = ['Datum'],\n",
" date_parser = lambda dateStr: pd.to_datetime(dateStr, utc = True))\n", " date_parser = lambda dateStr: pd.to_datetime(dateStr, utc = True))\n",
" if bundesland is not None:\n", " if bundesland is not None:\n",
" return df[df['Bundesland'] == bundesland][['Datum', 'Belegte_Intensivbetten', 'Freie_Intensivbetten', '7_Tage_Notfallreserve']]\n", " return dataFrame[dataFrame['Bundesland'] == bundesland][['Datum', 'Belegte_Intensivbetten', 'Freie_Intensivbetten', '7_Tage_Notfallreserve']]\n",
" else:\n", " else:\n",
" res = df.groupby('Datum').agg(**{\n", " return dataFrame.groupby('Datum').agg(**{\n",
" 'Belegte_Intensivbetten': pd.NamedAgg(column = 'Belegte_Intensivbetten', aggfunc = 'sum'),\n", " 'Belegte_Intensivbetten': pd.NamedAgg(column = 'Belegte_Intensivbetten', aggfunc = 'sum'),\n",
" 'Freie_Intensivbetten': pd.NamedAgg(column = 'Freie_Intensivbetten', aggfunc = 'sum'),\n", " 'Freie_Intensivbetten': pd.NamedAgg(column = 'Freie_Intensivbetten', aggfunc = 'sum'),\n",
" '7_Tage_Notfallreserve': pd.NamedAgg(column = '7_Tage_Notfallreserve', aggfunc = 'sum'), \n", " '7_Tage_Notfallreserve': pd.NamedAgg(column = '7_Tage_Notfallreserve', aggfunc = 'sum'), \n",
" })\n", " }).reset_index()"
" #df = df[['Datum', 'Belegte_Intensivbetten', 'Freie_Intensivbetten', '7_Tage_Notfallreserve']]\n",
" #res.to_csv('../docs/data/intensivstationen/data-de-generated.csv', index = True)\n",
" return res.reset_index()"
] ]
}, },
{ {