patching expected results refs #21, #13142

tests/sumo/cf_model/fundamental/circle_krauss_bikes_sublane/output.sumo

@@ -1,13 +1,13 @@
 Loading net-file from 'net4.net.xml' ... done (0ms).
-Loading additional-files from 'input_additional4.add.xml' ... done (0ms).
+Loading additional-files from 'input_additional4.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_20_0+0441-b48668e145b started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 3600.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 1.49s
- Real time factor: 2414.49
- UPS: 144827.632461
+ Duration: 3.23s
+ Real time factor: 1115.24
+ UPS: 66895.291202
 Vehicles:
  Inserted: 60 (Loaded: 1000)
  Running: 60
@@ -18,5 +18,5 @@ Bike Statistics (avg of 60):
  Duration: 3598.97
  WaitingTime: 175.08
  TimeLoss: 2369.94
- DepartDelay: 0.00
+ DepartDelay: 1.00
  DepartDelayWaiting: 0.00

tests/sumo/cf_model/fundamental/krauss_bikes_sublane/output.sumo

@@ -1,13 +1,13 @@
-Loading net-file from 'net2.net.xml' ... done (1ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net2.net.xml' ... done (2ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0455-1c3b13a100c started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 600.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 1.22s
- Real time factor: 493.827
- UPS: 202579.423868
+ Duration: 2.96s
+ Real time factor: 202.497
+ UPS: 83069.186635
 Vehicles:
  Inserted: 861 (Loaded: 999)
  Running: 627
@@ -18,4 +18,4 @@ Bike Statistics (avg of 234):
  Duration: 435.38
  WaitingTime: 0.12
  TimeLoss: 83.98
- DepartDelay: 0.00
+ DepartDelay: 1.40

tests/sumo/cf_model/fundamental/krauss_bikes_t1_s1/output.sumo

@@ -1,13 +1,13 @@
-Loading net-file from 'net2.net.xml' ... done (1ms).
+Loading net-file from 'net2.net.xml' ... done (3ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0441-b48668e145b started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 3600.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 0.72s
- Real time factor: 4979.25
- UPS: 992266.943292
+ Duration: 1.88s
+ Real time factor: 1911.84
+ UPS: 380992.565056
 Vehicles:
  Inserted: 1545 (Loaded: 3600)
  Running: 217
@@ -18,4 +18,4 @@ Bike Statistics (avg of 1328):
  Duration: 503.11
  WaitingTime: 21.33
  TimeLoss: 143.84
- DepartDelay: 0.00
+ DepartDelay: 3.99

tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo

@@ -1,14 +1,14 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 1029.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.01s
- Real time factor: 128625
- UPS: 82625.000000
- UPS-Persons: 103000.000000
+ Real time factor: 171500
+ UPS: 110166.666667
+ UPS-Persons: 137333.333333
 Vehicles:
  Inserted: 5
  Running: 0
@@ -22,13 +22,13 @@ Statistics (avg of 4):
  Duration: 128.00
  WaitingTime: 0.00
  TimeLoss: 23.75
+ DepartDelay: 0.00
 Bike Statistics (avg of 1):
  RouteLength: 751.85
  Speed: 5.05
  Duration: 149.00
  WaitingTime: 1.00
  TimeLoss: 13.67
-Statistics (avg of 5):
  DepartDelay: 0.00
 Pedestrian Statistics (avg of 1 walks):
  RouteLength: 503.06

tests/sumo/extended/bikes/tls_merge_right/output.sumo

@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (3ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_12_0+0426-579bba2 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 410.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.03s
- Real time factor: 14642.9
- UPS: 172428.571429
+ Duration: 0.01s
+ Real time factor: 34166.7
+ UPS: 402333.333333
 Vehicles:
  Inserted: 73
  Running: 0
@@ -17,11 +17,11 @@ Statistics (avg of 35):
  Duration: 77.77
  WaitingTime: 37.37
  TimeLoss: 63.57
+ DepartDelay: 0.20
 Bike Statistics (avg of 38):
  RouteLength: 183.56
  Speed: 3.64
  Duration: 55.42
  WaitingTime: 14.37
  TimeLoss: 21.91
-Statistics (avg of 73):
- DepartDelay: 0.40
+ DepartDelay: 0.18

tests/sumo/extended/bikes/tls_merge_right_crossing/output.sumo

@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (3ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_12_0+0426-579bba2 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 440.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.02s
- Real time factor: 20000
- UPS: 251272.727273
+ Duration: 0.01s
+ Real time factor: 48888.9
+ UPS: 614222.222222
 Vehicles:
  Inserted: 73
  Running: 0
@@ -15,13 +15,13 @@ Statistics (avg of 35):
  RouteLength: 189.53
  Speed: 2.09
  Duration: 98.63
- WaitingTime: 49.29
- TimeLoss: 83.85
+ WaitingTime: 49.28
+ TimeLoss: 83.84
+ DepartDelay: 0.20
 Bike Statistics (avg of 38):
  RouteLength: 190.43
  Speed: 3.75
  Duration: 54.63
  WaitingTime: 12.24
  TimeLoss: 19.85
-Statistics (avg of 73):
- DepartDelay: 0.43
+ DepartDelay: 0.21

tests/sumo/extended/bikes/tls_merge_right_noInternal/output.sumo

@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_14_1+0775-edc6051 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 461.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.03s
- Real time factor: 17730.8
- UPS: 190538.461538
+ Duration: 0.01s
+ Real time factor: 41909.1
+ UPS: 450363.636364
 Vehicles:
  Inserted: 73
  Running: 0
@@ -17,11 +17,11 @@ Statistics (avg of 35):
  Duration: 79.91
  WaitingTime: 41.86
  TimeLoss: 65.45
+ DepartDelay: 0.20
 Bike Statistics (avg of 38):
  RouteLength: 198.30
  Speed: 3.78
  Duration: 56.76
  WaitingTime: 13.05
  TimeLoss: 20.62
-Statistics (avg of 73):
- DepartDelay: 0.43
+ DepartDelay: 0.21

tests/sumo/extended/bikes/tls_merge_straight/output.sumo

@@ -1,12 +1,12 @@
 Loading net-file from 'net.net.xml' ... done (3ms).
 Loading done.
-Simulation version v1_15_0+0749-de9f6f8 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 402.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.03s
- Real time factor: 15461.5
- UPS: 163269.230769
+ Duration: 0.01s
+ Real time factor: 33500
+ UPS: 353750.000000
 Vehicles:
  Inserted: 73
  Running: 0
@@ -17,11 +17,11 @@ Statistics (avg of 35):
  Duration: 34.48
  WaitingTime: 11.66
  TimeLoss: 19.99
+ DepartDelay: 0.20
 Bike Statistics (avg of 38):
  RouteLength: 198.43
  Speed: 2.73
  Duration: 79.95
  WaitingTime: 30.95
  TimeLoss: 43.77
-Statistics (avg of 73):
- DepartDelay: 0.48
+ DepartDelay: 0.26

tests/sumo/extended/bikes/tls_merge_straight_noInternal/output.sumo

@@ -1,12 +1,12 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_15_0+0749-de9f6f8 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 401.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.02s
- Real time factor: 21105.3
- UPS: 217000.000000
+ Duration: 0.01s
+ Real time factor: 33416.7
+ UPS: 343583.333333
 Vehicles:
  Inserted: 73
  Running: 0
@@ -17,11 +17,11 @@ Statistics (avg of 35):
  Duration: 33.77
  WaitingTime: 11.23
  TimeLoss: 19.20
+ DepartDelay: 0.20
 Bike Statistics (avg of 38):
  RouteLength: 198.30
  Speed: 2.82
  Duration: 77.39
  WaitingTime: 28.89
  TimeLoss: 41.27
-Statistics (avg of 73):
- DepartDelay: 0.43
+ DepartDelay: 0.21

tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo

@@ -1,12 +1,12 @@
 Loading net-file from 'net3.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 655.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.01s
- Real time factor: 50384.6
- UPS: 395846.153846
+ Duration: 0.02s
+ Real time factor: 43666.7
+ UPS: 343066.666667
 Vehicles:
  Inserted: 112
  Running: 0
@@ -17,6 +17,6 @@ Bike Statistics (avg of 50):
  Duration: 55.50
  WaitingTime: 13.04
  TimeLoss: 19.31
- DepartDelay: 0.00
+ DepartDelay: 0.53
 DijkstraRouter answered 112 queries and explored 3.00 edges on average.
-DijkstraRouter spent 0.00s answering queries (0.01ms on average).
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo

@@ -1,13 +1,13 @@
 Loading net-file from 'net3.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 1048.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.11s
- Real time factor: 9274.34
- UPS: 166230.088496
+ Real time factor: 9192.98
+ UPS: 164771.929825
 Vehicles:
  Inserted: 343
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 181):
  Duration: 56.53
  WaitingTime: 35.90
  TimeLoss: 40.46
+ DepartDelay: 0.01
 Bike Statistics (avg of 162):
  RouteLength: 215.28
  Speed: 4.78
  Duration: 52.78
  WaitingTime: 12.37
  TimeLoss: 13.68
-Statistics (avg of 343):
- DepartDelay: 0.02
+ DepartDelay: 0.01
 DijkstraRouter answered 343 queries and explored 3.78 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo

@@ -1,13 +1,13 @@
-Loading net-file from 'net3.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (11ms).
+Loading net-file from 'net3.net.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_21_0+1186-e3e93bd8c94 started with time: 0.00.
+Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00.
 Simulation ended at time: 1697.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 1.49s
- Real time factor: 1136.64
- UPS: 46801.071668
+ Duration: 0.69s
+ Real time factor: 2448.77
+ UPS: 100828.282828
 Vehicles:
  Inserted: 834
  Running: 0
@@ -19,13 +19,13 @@ Statistics (avg of 413):
  Duration: 69.62
  WaitingTime: 38.95
  TimeLoss: 53.91
+ DepartDelay: 410.74
 Bike Statistics (avg of 421):
  RouteLength: 265.58
  Speed: 5.00
  Duration: 97.67
  WaitingTime: 46.95
  TimeLoss: 49.44
-Statistics (avg of 834):
- DepartDelay: 566.24
+ DepartDelay: 152.54
 DijkstraRouter answered 4446 queries and explored 4.61 edges on average.
-DijkstraRouter spent 0.01s answering queries (0.00ms on average).
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).