refactoring
This commit is contained in:
@@ -83,7 +83,8 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"timeSeries = readTimeseries(download = needsUpdate)"
|
||||
"timeSeries = readTimeseries(download = needsUpdate)\n",
|
||||
"timeSeries"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -119,23 +120,10 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)\n",
|
||||
"medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('Kreis')\n",
|
||||
"medianOfFreeBedsByKreisTable.reset_index().to_json('../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json', orient = \"records\")"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "396cb4f8",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n",
|
||||
" medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
|
||||
" return ColumnsAdder(readKreise()).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
|
||||
" \n",
|
||||
"medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
|
||||
"medianOfFreeBedsByKreisTable = MedianOfFreeBedsByKreisTableFactory(timeSeries).createMedianOfFreeBedsByKreisTable('Kreis')\n",
|
||||
"medianOfFreeBedsByKreisTable.reset_index().to_json(\n",
|
||||
" '../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json',\n",
|
||||
" orient = \"records\")"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -160,7 +148,7 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"createMedianOfFreeBedsByKreisChart(\n",
|
||||
" medianOfFreeBedsByKreisTable,\n",
|
||||
" timeSeries,\n",
|
||||
" chartTitle = getChartTitle(\n",
|
||||
" dateStart=timeSeries['date'].min(),\n",
|
||||
" dateEnd=timeSeries['date'].max()))"
|
||||
|
||||
Reference in New Issue
Block a user