Skip to content
Snippets Groups Projects
Commit 9fdeeefc authored by Till Herz's avatar Till Herz
Browse files

Merge remote-tracking branch 'origin/main' into dev_jgn_bus_charging

+ adaptions based on suggestions by Christoph

# Conflicts:
#	Model_Library
#	runme.py
parents 6f7a100e 780f5242
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 20 deletions
Subproject commit d3e1470ffb3862f18d3c2d50c9555a1b4842bf98 Subproject commit de811bb6a3ae5a1e7743b0086ee7ffa3dfc41516
Subproject commit f82ba6f7d9f1316a3cd36b8af27c99953803d17d Subproject commit 0961692dd8a92856b5600013bd5ddbba5618b311
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
Timestamp,Power,Driving,Connected Timestamp,Power,Driving,Connected to depot
2019-05-10 00:00:00,0,0,1 2019-05-10 00:00:00,0,0,1
2019-05-10 00:01:00,0,0,1 2019-05-10 00:01:00,0,0,1
2019-05-10 00:02:00,0,0,1 2019-05-10 00:02:00,0,0,1
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment