refactoring
This commit is contained in:
@@ -17,30 +17,11 @@
|
|||||||
{
|
{
|
||||||
"cell_type": "code",
|
"cell_type": "code",
|
||||||
"execution_count": null,
|
"execution_count": null,
|
||||||
"id": "0927a6c2",
|
"id": "f179762b",
|
||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"kreise = pd.read_excel(\n",
|
"def readTimeseries():\n",
|
||||||
" '04-kreise.xlsx',\n",
|
|
||||||
" sheet_name = 'Kreisfreie Städte u. Landkreise',\n",
|
|
||||||
" header = 5,\n",
|
|
||||||
" index_col = 0)\n",
|
|
||||||
"kreise = kreise.rename(columns = {'2': 'Bundesland', 3: 'Kreis', 6: 'Einwohnerzahl'})[['Bundesland', 'Kreis', 'Einwohnerzahl']]\n",
|
|
||||||
"kreise.index.set_names(\"Key\", inplace = True)\n",
|
|
||||||
"kreise"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cell_type": "code",
|
|
||||||
"execution_count": null,
|
|
||||||
"id": "c1dea262",
|
|
||||||
"metadata": {},
|
|
||||||
"outputs": [],
|
|
||||||
"source": [
|
|
||||||
"class TimeseriesReader:\n",
|
|
||||||
" \n",
|
|
||||||
" def readTimeseries(self):\n",
|
|
||||||
" timeseries = pd.read_csv(\n",
|
" timeseries = pd.read_csv(\n",
|
||||||
" 'zeitreihe-tagesdaten.csv',\n",
|
" 'zeitreihe-tagesdaten.csv',\n",
|
||||||
" low_memory = False,\n",
|
" low_memory = False,\n",
|
||||||
@@ -57,12 +38,19 @@
|
|||||||
{
|
{
|
||||||
"cell_type": "code",
|
"cell_type": "code",
|
||||||
"execution_count": null,
|
"execution_count": null,
|
||||||
"id": "d978b069",
|
"id": "0927a6c2",
|
||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"timeSeries = TimeseriesReader().readTimeseries()\n",
|
"def readKreise():\n",
|
||||||
"timeSeries"
|
" kreise = pd.read_excel(\n",
|
||||||
|
" '04-kreise.xlsx',\n",
|
||||||
|
" sheet_name = 'Kreisfreie Städte u. Landkreise',\n",
|
||||||
|
" header = 5,\n",
|
||||||
|
" index_col = 0)\n",
|
||||||
|
" kreise = kreise.rename(columns = {'2': 'Bundesland', 3: 'Kreis', 6: 'Einwohnerzahl'})[['Bundesland', 'Kreis', 'Einwohnerzahl']]\n",
|
||||||
|
" kreise.index.set_names(\"Key\", inplace = True)\n",
|
||||||
|
" return kreise"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -102,7 +90,7 @@
|
|||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
|
"timeSeries = ColumnsAdder(readKreise()).addKreisAndBundeslandAndEinwohnerzahlColumns(readTimeseries())\n",
|
||||||
"timeSeries"
|
"timeSeries"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user