Skip to content

Commit a4410f5

Browse files
Tim HofferberthTim Hofferberth
Tim Hofferberth
authored and
Tim Hofferberth
committed
Added export of Dataset into csv and import it to the map. Corrected values lat and long.
1 parent 4487a7d commit a4410f5

File tree

3 files changed

+141
-53
lines changed

3 files changed

+141
-53
lines changed

‎.ipynb_checkpoints/group_2-checkpoint.ipynb

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": null,
5+
"execution_count": 1,
66
"metadata": {},
77
"outputs": [],
88
"source": [
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"cell_type": "code",
15-
"execution_count": null,
15+
"execution_count": 2,
1616
"metadata": {},
1717
"outputs": [],
1818
"source": [
@@ -26,9 +26,36 @@
2626
},
2727
{
2828
"cell_type": "code",
29-
"execution_count": null,
29+
"execution_count": 3,
3030
"metadata": {},
31-
"outputs": [],
31+
"outputs": [
32+
{
33+
"name": "stdout",
34+
"output_type": "stream",
35+
"text": [
36+
" country long lat\n",
37+
"0 nl_import 52.208448 6.804434\n",
38+
"1 nl_export 51.938339 6.628553\n",
39+
"2 lu_import 49.945034 6.233296\n",
40+
"3 lu_export 49.604481 6.408965\n",
41+
"4 fr_import 49.089157 7.375149\n",
42+
"5 fr_export 48.684614 7.946076\n",
43+
"6 ch_import 47.629306 8.165664\n",
44+
"7 ch_export 47.629306 9.009500\n",
45+
"8 au_import 47.599681 12.206069\n",
46+
"9 au_export 47.954065 13.041866\n",
47+
"10 cz_import 49.290202 12.783043\n",
48+
"11 cz_export 50.001560 12.299951\n",
49+
"12 pl_import 52.342891 14.581793\n",
50+
"13 pl_export 52.019543 14.713545\n",
51+
"14 dk_import 54.769801 8.740771\n",
52+
"15 dk_export 54.769801 9.487368\n",
53+
"16 sw_import 55.098016 13.130464\n",
54+
"17 sw_export 55.072864 13.525799\n",
55+
"18 net_export 51.228388 9.707071\n"
56+
]
57+
}
58+
],
3259
"source": [
3360
"# load dataset\n",
3461
"DATASET = pd.read_csv(DATA_PATH, sep=';')\n",
@@ -49,9 +76,22 @@
4976
},
5077
{
5178
"cell_type": "code",
52-
"execution_count": null,
79+
"execution_count": 6,
5380
"metadata": {},
54-
"outputs": [],
81+
"outputs": [
82+
{
83+
"name": "stdout",
84+
"output_type": "stream",
85+
"text": [
86+
" value lat long\n",
87+
"2017-01-01 9.3288 9.707071 51.228388\n",
88+
"2017-01-01 1.3218 6.628553 51.938339\n",
89+
"2017-01-01 -2.0000 6.804434 52.208448\n",
90+
"2017-01-01 1.2000 9.009500 47.629306\n",
91+
"2017-01-01 0.0000 8.165664 47.629306\n"
92+
]
93+
}
94+
],
5595
"source": [
5696
"'''\n",
5797
"Define data operation functions\n",
@@ -83,28 +123,32 @@
83123
"'''\n",
84124
"Test functions\n",
85125
"'''\n",
86-
"DATASET = shrinkTimeGran(DATASET, '5H')\n",
87-
"print(toKeplerData(DATASET, GEO_DATA).head(5))"
126+
"#DATASET = shrinkTimeGran(DATASET, '5H')\n",
127+
"#print(toKeplerData(DATASET, GEO_DATA).head(5))"
88128
]
89129
},
90130
{
91131
"cell_type": "code",
92-
"execution_count": null,
132+
"execution_count": 16,
93133
"metadata": {},
94134
"outputs": [],
95135
"source": [
96136
"'''\n",
97137
"Data preparation\n",
98138
"'''\n",
99139
"\n",
100-
"# reduce time series granularity to 5 hours\n",
101-
"DATASET = shrinkTimeGran(DATASET, '5H')"
140+
"# reduce time series granularity to 1 Day\n",
141+
"DATASET = shrinkIntervalMean(DATASET, '23H')\n",
142+
"\n",
143+
"toKeplerData(DATASET, GEO_DATA).head(90).to_csv(r'geo_data_23H.csv')"
102144
]
103145
},
104146
{
105147
"cell_type": "code",
106-
"execution_count": 4,
107-
"metadata": {},
148+
"execution_count": 18,
149+
"metadata": {
150+
"scrolled": false
151+
},
108152
"outputs": [
109153
{
110154
"name": "stdout",
@@ -116,12 +160,12 @@
116160
{
117161
"data": {
118162
"application/vnd.jupyter.widget-view+json": {
119-
"model_id": "90ea9394abb744279538a6466b12c41b",
163+
"model_id": "7291c2fe6b064790b23c5ce10d4a0d4f",
120164
"version_major": 2,
121165
"version_minor": 0
122166
},
123167
"text/plain": [
124-
"KeplerGl(data={'Strom Import/Export': {'index': [0, 1, 2, 3], 'columns': ['timestamp', 'lat', 'long', 'weight'…"
168+
"KeplerGl(data={'Strom Import/Export': {'index': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,…"
125169
]
126170
},
127171
"metadata": {},
@@ -140,7 +184,7 @@
140184
"\n",
141185
"map_1 = KeplerGl(height=500)\n",
142186
"\n",
143-
"import_export_data = pd.read_csv(\"./test_data.csv\", sep=\";\")\n",
187+
"import_export_data = pd.read_csv(\"./geo_data_23H.csv\", sep=\",\")\n",
144188
"map_1.add_data(data=import_export_data, name='Strom Import/Export')\n",
145189
"\n",
146190
"map_1"
@@ -170,7 +214,7 @@
170214
"name": "python",
171215
"nbconvert_exporter": "python",
172216
"pygments_lexer": "ipython3",
173-
"version": "3.7.1"
217+
"version": "3.7.4"
174218
}
175219
},
176220
"nbformat": 4,

‎country_lat_long.csv

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
country;long;lat
2-
nl_import;52.208448;6.804434
3-
nl_export;51.938339;6.628553
4-
lu_import;49.945034;6.233296
5-
lu_export;49.604481;6.408965
6-
fr_import;49.089157;7.375149
7-
fr_export;48.684614;7.946076
8-
ch_import;47.629306;8.165664
9-
ch_export;47.629306;9.0095
10-
au_import;47.599681;12.206069
11-
au_export;47.954065;13.041866
12-
cz_import;49.290202;12.783043
13-
cz_export;50.001560;12.299951
14-
pl_import;52.342891;14.581793
15-
pl_export;52.019543;14.713545
16-
dk_import;54.769801;8.740771
17-
dk_export;54.769801;9.487368
18-
sw_import;55.098016;13.130464
19-
sw_export;55.072864;13.525799
20-
net_export;51.228388;9.707071
2+
nl_import;6.804434;52.208448
3+
nl_export;6.628553;51.938339
4+
lu_import;6.233296;49.945034
5+
lu_export;6.408965;49.604481
6+
fr_import;7.375149;49.089157
7+
fr_export;7.946076;48.684614
8+
ch_import;8.165664;47.629306
9+
ch_export;9.0095;47.629306
10+
au_import;12.206069;47.599681
11+
au_export;13.041866;47.954065
12+
cz_import;12.783043;49.290202
13+
cz_export;12.299951;50.001560
14+
pl_import;14.581793;52.342891
15+
pl_export;14.713545;52.019543
16+
dk_import;8.740771;54.769801
17+
dk_export;9.487368;54.769801
18+
sw_import;13.130464;55.098016
19+
sw_export;13.525799;55.072864
20+
net_export;9.707071;51.228388

‎group_2.ipynb

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": null,
5+
"execution_count": 1,
66
"metadata": {},
77
"outputs": [],
88
"source": [
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"cell_type": "code",
15-
"execution_count": null,
15+
"execution_count": 2,
1616
"metadata": {},
1717
"outputs": [],
1818
"source": [
@@ -26,9 +26,36 @@
2626
},
2727
{
2828
"cell_type": "code",
29-
"execution_count": null,
29+
"execution_count": 3,
3030
"metadata": {},
31-
"outputs": [],
31+
"outputs": [
32+
{
33+
"name": "stdout",
34+
"output_type": "stream",
35+
"text": [
36+
" country long lat\n",
37+
"0 nl_import 52.208448 6.804434\n",
38+
"1 nl_export 51.938339 6.628553\n",
39+
"2 lu_import 49.945034 6.233296\n",
40+
"3 lu_export 49.604481 6.408965\n",
41+
"4 fr_import 49.089157 7.375149\n",
42+
"5 fr_export 48.684614 7.946076\n",
43+
"6 ch_import 47.629306 8.165664\n",
44+
"7 ch_export 47.629306 9.009500\n",
45+
"8 au_import 47.599681 12.206069\n",
46+
"9 au_export 47.954065 13.041866\n",
47+
"10 cz_import 49.290202 12.783043\n",
48+
"11 cz_export 50.001560 12.299951\n",
49+
"12 pl_import 52.342891 14.581793\n",
50+
"13 pl_export 52.019543 14.713545\n",
51+
"14 dk_import 54.769801 8.740771\n",
52+
"15 dk_export 54.769801 9.487368\n",
53+
"16 sw_import 55.098016 13.130464\n",
54+
"17 sw_export 55.072864 13.525799\n",
55+
"18 net_export 51.228388 9.707071\n"
56+
]
57+
}
58+
],
3259
"source": [
3360
"# load dataset\n",
3461
"DATASET = pd.read_csv(DATA_PATH, sep=';')\n",
@@ -49,9 +76,22 @@
4976
},
5077
{
5178
"cell_type": "code",
52-
"execution_count": null,
79+
"execution_count": 6,
5380
"metadata": {},
54-
"outputs": [],
81+
"outputs": [
82+
{
83+
"name": "stdout",
84+
"output_type": "stream",
85+
"text": [
86+
" value lat long\n",
87+
"2017-01-01 9.3288 9.707071 51.228388\n",
88+
"2017-01-01 1.3218 6.628553 51.938339\n",
89+
"2017-01-01 -2.0000 6.804434 52.208448\n",
90+
"2017-01-01 1.2000 9.009500 47.629306\n",
91+
"2017-01-01 0.0000 8.165664 47.629306\n"
92+
]
93+
}
94+
],
5595
"source": [
5696
"'''\n",
5797
"Define data operation functions\n",
@@ -83,28 +123,32 @@
83123
"'''\n",
84124
"Test functions\n",
85125
"'''\n",
86-
"DATASET = shrinkTimeGran(DATASET, '5H')\n",
87-
"print(toKeplerData(DATASET, GEO_DATA).head(5))"
126+
"#DATASET = shrinkTimeGran(DATASET, '5H')\n",
127+
"#print(toKeplerData(DATASET, GEO_DATA).head(5))"
88128
]
89129
},
90130
{
91131
"cell_type": "code",
92-
"execution_count": null,
132+
"execution_count": 16,
93133
"metadata": {},
94134
"outputs": [],
95135
"source": [
96136
"'''\n",
97137
"Data preparation\n",
98138
"'''\n",
99139
"\n",
100-
"# reduce time series granularity to 5 hours\n",
101-
"DATASET = shrinkTimeGran(DATASET, '5H')"
140+
"# reduce time series granularity to 1 Day\n",
141+
"DATASET = shrinkIntervalMean(DATASET, '23H')\n",
142+
"\n",
143+
"toKeplerData(DATASET, GEO_DATA).head(90).to_csv(r'geo_data_23H.csv')"
102144
]
103145
},
104146
{
105147
"cell_type": "code",
106-
"execution_count": 4,
107-
"metadata": {},
148+
"execution_count": 18,
149+
"metadata": {
150+
"scrolled": false
151+
},
108152
"outputs": [
109153
{
110154
"name": "stdout",
@@ -116,12 +160,12 @@
116160
{
117161
"data": {
118162
"application/vnd.jupyter.widget-view+json": {
119-
"model_id": "90ea9394abb744279538a6466b12c41b",
163+
"model_id": "7291c2fe6b064790b23c5ce10d4a0d4f",
120164
"version_major": 2,
121165
"version_minor": 0
122166
},
123167
"text/plain": [
124-
"KeplerGl(data={'Strom Import/Export': {'index': [0, 1, 2, 3], 'columns': ['timestamp', 'lat', 'long', 'weight'…"
168+
"KeplerGl(data={'Strom Import/Export': {'index': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,…"
125169
]
126170
},
127171
"metadata": {},
@@ -140,7 +184,7 @@
140184
"\n",
141185
"map_1 = KeplerGl(height=500)\n",
142186
"\n",
143-
"import_export_data = pd.read_csv(\"./test_data.csv\", sep=\";\")\n",
187+
"import_export_data = pd.read_csv(\"./geo_data_23H.csv\", sep=\",\")\n",
144188
"map_1.add_data(data=import_export_data, name='Strom Import/Export')\n",
145189
"\n",
146190
"map_1"
@@ -170,7 +214,7 @@
170214
"name": "python",
171215
"nbconvert_exporter": "python",
172216
"pygments_lexer": "ipython3",
173-
"version": "3.7.1"
217+
"version": "3.7.4"
174218
}
175219
},
176220
"nbformat": 4,

0 commit comments

Comments
 (0)