patching expected results refs #21, #14587

tests/sumo/bugs/13xxx/ticket13290/errors.sumo

@@ -1,3 +1,4 @@
 Warning: Vehicle 'v_1.15' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=81.10.
 Warning: Vehicle 'v_0.9' performs emergency braking on lane ':J14_4_0' with decel=9.00, wished=4.50, severity=1.00, time=81.60.
 Warning: Vehicle 'v_1.41' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=203.70.
+Warning: Vehicle 'v_1.55' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=281.80.

tests/sumo/devices/bluelight/opposite_multiple_oncoming/tripinfos.sumo

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-01 13:05:02 by Eclipse SUMO sumo Version v1_16_0+0850-438bb8b
+<!-- generated on 2024-03-24 01:34:46 by Eclipse SUMO sumo Version v1_19_0+1503-dc8d37d4d7b
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at

tests/sumo/devices/ssm/bugs/testsuite.sumo

@@ -1,6 +1,3 @@
-# SSM device reports collisions with oncoming traffic on another lane
-ticket13918
-
 # SSM device crashes on junction without internal lane
 ticket4350
 
@@ -19,3 +16,6 @@ ticket7836
 
 # emergency vehicle with bluelight device performs lane change that disrupts a follower relationship.
 ticket11336
+
+# SSM device reports collisions with oncoming traffic on another lane
+ticket13918

tests/sumo/lc_model/bugs/ticket14587/errors.sumo

@@ -1,3 +1,3 @@
-Warning: Vehicle 'f_12.5' performs emergency braking on lane 'E6_0' with decel=9.00, wished=4.50, severity=1.00, time=87.50.
-Warning: Vehicle 'f_19.52' performs emergency braking on lane 'E2_0' with decel=9.00, wished=4.50, severity=1.00, time=580.50.
-Warning: Vehicle 'f_22.73' performs emergency braking on lane ':J9_0_0' with decel=9.00, wished=4.50, severity=1.00, time=870.00.
+Warning: Vehicle 'f_16.5' performs emergency braking on lane 'E0_0' with decel=9.00, wished=4.50, severity=1.00, time=91.00.
+Warning: Vehicle 'f_20.10' performs emergency braking on lane 'E4_0' with decel=9.00, wished=4.50, severity=1.00, time=137.50.
+Warning: Vehicle 'f_17.17' performs emergency braking on lane 'E2_0' with decel=9.00, wished=4.50, severity=1.00, time=207.50.

tests/sumo/lc_model/bugs/ticket14587/output.sumo

@@ -1,22 +1,22 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (2ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
 Simulation ended at time: 1000.00
 Reason: The final simulation step has been reached.
 Performance: 
- Duration: 0.42s
- Real time factor: 2380.95
- UPS: 717492.857143
+ Duration: 0.59s
+ Real time factor: 1697.79
+ UPS: 443266.553480
 Vehicles: 
  Inserted: 1200
- Running: 196
+ Running: 141
  Waiting: 0
  Emergency Braking: 3
-Statistics (avg of 1004):
- RouteLength: 1149.62
- Speed: 9.18
- Duration: 133.02
- WaitingTime: 16.23
- TimeLoss: 47.21
- DepartDelay: 1.63
+Statistics (avg of 1059):
+ RouteLength: 1149.91
+ Speed: 10.42
+ Duration: 114.53
+ WaitingTime: 10.83
+ TimeLoss: 28.68
+ DepartDelay: 1.64
 

tests/sumo/lc_model/roundabout/high_traffic/output.sumo

@@ -1,24 +1,24 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
-Simulation ended at time: 1125.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1101.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.19s
- Real time factor: 6048.39
- UPS: 587505.376344
+ Duration: 0.27s
+ Real time factor: 4032.97
+ UPS: 349293.040293
 Vehicles: 
  Inserted: 1015
  Running: 0
  Waiting: 0
 Statistics (avg of 1015):
- RouteLength: 616.70
- Speed: 6.71
- Duration: 107.66
- WaitingTime: 21.08
- TimeLoss: 61.59
- DepartDelay: 1.49
+ RouteLength: 616.67
+ Speed: 7.37
+ Duration: 93.95
+ WaitingTime: 15.10
+ TimeLoss: 47.87
+ DepartDelay: 1.55
 
 DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/lc_model/roundabout/low_traffic/output.sumo

@@ -1,24 +1,24 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (2ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
+Simulation version v1_19_0+1500-2f9f2ee7e84 started with time: 0.00.
 Simulation ended at time: 1051.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.03s
- Real time factor: 31848.5
- UPS: 474151.515152
+ Duration: 0.07s
+ Real time factor: 15924.2
+ UPS: 236515.151515
 Vehicles: 
  Inserted: 282 (Loaded: 564)
  Running: 0
  Waiting: 0
 Statistics (avg of 282):
- RouteLength: 615.71
- Speed: 11.11
- Duration: 55.48
- WaitingTime: 0.23
- TimeLoss: 9.45
+ RouteLength: 615.68
+ Speed: 11.14
+ Duration: 55.35
+ WaitingTime: 0.22
+ TimeLoss: 9.30
  DepartDelay: 0.05
 
 DijkstraRouter answered 282 queries and explored 4.94 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/lc_model/roundabout/medium_traffic/output.sumo

@@ -1,23 +1,23 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
-Simulation ended at time: 1066.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1064.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.06s
- Real time factor: 17193.5
- UPS: 541935.483871
+ Duration: 0.12s
+ Real time factor: 8793.39
+ UPS: 274462.809917
 Vehicles: 
  Inserted: 564
  Running: 0
  Waiting: 0
 Statistics (avg of 564):
- RouteLength: 615.94
- Speed: 10.48
- Duration: 59.57
- WaitingTime: 2.43
- TimeLoss: 13.53
+ RouteLength: 615.81
+ Speed: 10.59
+ Duration: 58.88
+ WaitingTime: 2.10
+ TimeLoss: 12.85
  DepartDelay: 0.29
 
 DijkstraRouter answered 564 queries and explored 4.97 edges on average.

tests/sumo/lc_model/roundabout/mixed/high_traffic/output.sumo

@@ -1,24 +1,24 @@
-Loading net-file from 'net.net.xml' ... done (0ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
-Simulation ended at time: 1147.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1150.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.20s
- Real time factor: 5622.55
- UPS: 551764.705882
+ Duration: 0.38s
+ Real time factor: 3042.33
+ UPS: 299023.809524
 Vehicles: 
  Inserted: 1015
  Running: 0
  Waiting: 0
 Statistics (avg of 1015):
- RouteLength: 616.50
- Speed: 6.41
- Duration: 110.90
- WaitingTime: 21.06
- TimeLoss: 64.84
- DepartDelay: 1.67
+ RouteLength: 616.37
+ Speed: 6.48
+ Duration: 111.36
+ WaitingTime: 21.44
+ TimeLoss: 65.32
+ DepartDelay: 1.65
 
 DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/lc_model/roundabout/mixed/low_traffic/output.sumo

@@ -1,23 +1,23 @@
-Loading net-file from 'net.net.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
+Simulation version v1_19_0+1500-2f9f2ee7e84 started with time: 0.00.
 Simulation ended at time: 1051.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.04s
- Real time factor: 30028.6
- UPS: 450600.000000
+ Duration: 0.07s
+ Real time factor: 14802.8
+ UPS: 222521.126761
 Vehicles: 
  Inserted: 282 (Loaded: 564)
  Running: 0
  Waiting: 0
 Statistics (avg of 282):
- RouteLength: 615.31
- Speed: 11.02
- Duration: 55.92
- WaitingTime: 0.20
- TimeLoss: 9.94
+ RouteLength: 615.36
+ Speed: 11.00
+ Duration: 56.02
+ WaitingTime: 0.24
+ TimeLoss: 10.00
  DepartDelay: 0.05
 
 DijkstraRouter answered 282 queries and explored 4.94 edges on average.

tests/sumo/lc_model/roundabout/mixed/medium_traffic/output.sumo

@@ -1,24 +1,24 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
-Simulation ended at time: 1067.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1073.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.06s
- Real time factor: 16671.9
- UPS: 529984.375000
+ Duration: 0.12s
+ Real time factor: 9016.81
+ UPS: 288428.571429
 Vehicles: 
  Inserted: 564
  Running: 0
  Waiting: 0
 Statistics (avg of 564):
- RouteLength: 615.66
- Speed: 10.39
- Duration: 60.14
- WaitingTime: 2.58
- TimeLoss: 14.15
- DepartDelay: 0.32
+ RouteLength: 615.51
+ Speed: 10.31
+ Duration: 60.86
+ WaitingTime: 3.05
+ TimeLoss: 14.89
+ DepartDelay: 0.33
 
 DijkstraRouter answered 564 queries and explored 4.97 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/lc_model/roundabout/no_cooperation/high_traffic/output.sumo

@@ -1,24 +1,24 @@
-Loading net-file from 'net.net.xml' ... done (4ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
-Simulation ended at time: 1554.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1548.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 3.70s
- Real time factor: 420
- UPS: 69514.594595
+ Duration: 0.73s
+ Real time factor: 2129.3
+ UPS: 356107.290234
 Vehicles: 
  Inserted: 1015
  Running: 0
  Waiting: 0
 Statistics (avg of 1015):
- RouteLength: 616.06
- Speed: 3.36
- Duration: 253.40
- WaitingTime: 127.67
- TimeLoss: 207.40
- DepartDelay: 72.93
+ RouteLength: 616.14
+ Speed: 3.38
+ Duration: 255.06
+ WaitingTime: 130.03
+ TimeLoss: 209.05
+ DepartDelay: 71.61
 
-DijkstraRouter answered 1315 queries and explored 5.05 edges on average.
-DijkstraRouter spent 0.01s answering queries (0.01ms on average).
+DijkstraRouter answered 1327 queries and explored 5.05 edges on average.
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/lc_model/roundabout/outer_exitMinor/high_traffic/output.sumo

@@ -1,24 +1,24 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
-Simulation ended at time: 1148.00
+Simulation version v1_19_0+1501-6a89c2af9fe started with time: 0.00.
+Simulation ended at time: 1173.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.19s
- Real time factor: 5917.53
- UPS: 584530.927835
+ Duration: 0.35s
+ Real time factor: 3370.69
+ UPS: 338919.540230
 Vehicles: 
  Inserted: 1015
  Running: 0
  Waiting: 0
 Statistics (avg of 1015):
- RouteLength: 616.81
- Speed: 6.78
- Duration: 111.72
- WaitingTime: 23.14
- TimeLoss: 65.60
- DepartDelay: 1.61
+ RouteLength: 616.75
+ Speed: 6.52
+ Duration: 116.20
+ WaitingTime: 26.95
+ TimeLoss: 70.11
+ DepartDelay: 1.53
 
 DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/lc_model/roundabout/outer_exitMinor/low_traffic/output.sumo

@@ -1,23 +1,23 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (2ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
+Simulation version v1_19_0+1500-2f9f2ee7e84 started with time: 0.00.
 Simulation ended at time: 1051.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 0.03s
- Real time factor: 31848.5
- UPS: 474121.212121
+ Duration: 0.07s
+ Real time factor: 14202.7
+ UPS: 211702.702703
 Vehicles: 
  Inserted: 282 (Loaded: 564)
  Running: 0
  Waiting: 0
 Statistics (avg of 282):
- RouteLength: 615.48
- Speed: 11.11
- Duration: 55.48
- WaitingTime: 0.37
- TimeLoss: 9.43
+ RouteLength: 615.41
+ Speed: 11.10
+ Duration: 55.55
+ WaitingTime: 0.42
+ TimeLoss: 9.53
  DepartDelay: 0.05
 
 DijkstraRouter answered 282 queries and explored 4.94 edges on average.