patching expected results refs #21, #15224

tests/sumo/devices/ssm/bugs/ticket13918/errors.sumo

@@ -1,6 +1,2 @@
 Warning: Vehicle 'flow_1.26' performs emergency braking on lane 'E11_0' with decel=9.00, wished=4.50, severity=1.00, time=174.25.
 Warning: Vehicle 'flow_0.2' performs emergency braking on lane 'E6_1' with decel=9.00, wished=4.50, severity=1.00, time=174.25.
-Warning: Vehicle 'flow_0.115' performs emergency braking on lane 'E3_0' with decel=9.00, wished=4.50, severity=1.00, time=482.75.
-Warning: Vehicle 'flow_1.86' performs emergency braking on lane 'E14_1' with decel=9.00, wished=4.50, severity=1.00, time=482.75.
-Warning: Vehicle 'flow_1.89' performs emergency braking on lane 'E14_1' with decel=9.00, wished=4.50, severity=1.00, time=486.00.
-Warning: Vehicle 'flow_0.110' performs emergency braking on lane 'E3_0' with decel=9.00, wished=4.50, severity=1.00, time=486.50.

tests/sumo/devices/ssm/bugs/ticket13918/ssm.sumo

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-10-18 18:12:39 by Eclipse SUMO sumo Version v1_14_1+10328-ceb737dd7d7
+<!-- generated on 2024-07-30 15:07:05 by Eclipse SUMO sumo Version v1_20_0+1468-bcc53941aad
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -42,32 +42,26 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <device.ssm.file value="ssm.xml"/>
     </ssm_device>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <SSMLog>
     <conflict begin="170.75" end="174.75" ego="flow_1.26" foe="flow_0.2">
-        <minTTC time="174.25" position="4272.57,101.78" type="20" value="0.37" speed="21.22"/>
+        <minTTC time="174.25" position="4272.58,101.78" type="20" value="0.37" speed="21.22"/>
     </conflict>
     <conflict begin="172.25" end="174.75" ego="flow_1.26" foe="flow_0.5">
-        <minTTC time="174.25" position="4238.27,101.79" type="20" value="1.67" speed="21.22"/>
+        <minTTC time="174.25" position="4238.28,101.79" type="20" value="1.67" speed="21.22"/>
     </conflict>
     <conflict begin="170.75" end="174.75" ego="flow_0.2" foe="flow_1.26">
-        <minTTC time="174.25" position="4272.57,101.78" type="20" value="0.37" speed="22.37"/>
+        <minTTC time="174.25" position="4272.58,101.78" type="20" value="0.37" speed="22.37"/>
     </conflict>
     <conflict begin="172.25" end="174.75" ego="flow_0.5" foe="flow_1.26">
-        <minTTC time="174.25" position="4238.27,101.79" type="20" value="1.67" speed="29.56"/>
+        <minTTC time="174.25" position="4238.28,101.79" type="20" value="1.67" speed="29.56"/>
     </conflict>
-    <conflict begin="482.75" end="487.00" ego="flow_0.110" foe="flow_1.89">
-        <minTTC time="486.50" position="1780.02,101.92" type="20" value="0.30" speed="17.62"/>
+    <conflict begin="482.75" end="484.50" ego="flow_0.110" foe="flow_1.89">
+        <minTTC time="484.00" position="1781.49,101.92" type="20" value="2.77" speed="21.00"/>
     </conflict>
-    <conflict begin="482.50" end="483.00" ego="flow_1.86" foe="flow_0.115">
-        <minTTC time="482.50" position="1367.58,102.09" type="20" value="0.65" speed="28.87"/>
-    </conflict>
-    <conflict begin="482.50" end="483.00" ego="flow_0.115" foe="flow_1.86">
-        <minTTC time="482.50" position="1367.58,102.09" type="20" value="0.65" speed="23.92"/>
-    </conflict>
-    <conflict begin="482.75" end="487.00" ego="flow_1.89" foe="flow_0.110">
-        <minTTC time="486.50" position="1780.02,101.92" type="20" value="0.30" speed="20.57"/>
+    <conflict begin="482.75" end="484.50" ego="flow_1.89" foe="flow_0.110">
+        <minTTC time="484.00" position="1781.49,101.92" type="20" value="2.77" speed="28.89"/>
     </conflict>
 </SSMLog>

tests/sumo/junction_model/junction_type/zipper/variations_adaptDist_10/errors.sumo

@@ -1,21 +0,0 @@
-Warning: Vehicle 'left.21' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=116.00.
-Warning: Vehicle 'right.31' performs emergency braking on lane ':gneJ1_0_0' with decel=9.00, wished=4.50, severity=1.00, time=167.00.
-Warning: Vehicle 'left.36' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=191.00.
-Warning: Vehicle 'left.38' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=200.00.
-Warning: Vehicle 'left.46' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=237.00.
-Warning: Vehicle 'right.47' performs emergency braking on lane 'middle_0' with decel=9.00, wished=4.50, severity=1.00, time=243.00.
-Warning: Vehicle 'left.61' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=312.00.
-Warning: Vehicle 'right.69' performs emergency braking on lane ':gneJ1_0_0' with decel=9.00, wished=4.50, severity=1.00, time=352.00.
-Warning: Vehicle 'left.76' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=392.00.
-Warning: Vehicle 'left.96' performs emergency braking on lane ':gneJ1_0_1' with decel=9.00, wished=4.50, severity=1.00, time=489.00.
-Warning: Vehicle 'right.104' performs emergency braking on lane 'middle_0' with decel=9.00, wished=4.50, severity=1.00, time=528.00.
-Warning: Vehicle 'right.106' performs emergency braking on lane 'middle_0' with decel=9.00, wished=4.50, severity=1.00, time=536.00.
-Warning: Vehicle 'right.131' performs emergency braking on lane 'middle_0' with decel=9.00, wished=4.50, severity=1.00, time=661.00.
-Warning: Vehicle 'left.131' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=662.00.
-Warning: Vehicle 'left.137' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=694.00.
-Warning: Vehicle 'left.151' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=767.00.
-Warning: Vehicle 'right.155' performs emergency braking on lane ':gneJ1_0_0' with decel=9.00, wished=4.50, severity=1.00, time=784.00.
-Warning: Vehicle 'right.164' performs emergency braking on lane ':gneJ1_0_0' with decel=9.00, wished=4.50, severity=1.00, time=831.00.
-Warning: Vehicle 'left.181' performs emergency braking on lane ':gneJ1_0_1' with decel=9.00, wished=4.50, severity=1.00, time=913.00.
-Warning: Vehicle 'right.187' performs emergency braking on lane ':gneJ1_0_0' with decel=9.00, wished=4.50, severity=1.00, time=944.00.
-Warning: Vehicle 'left.191' performs emergency braking on lane 'middle_1' with decel=9.00, wished=4.50, severity=1.00, time=962.00.

tests/sumo/junction_model/junction_type/zipper/variations_adaptDist_10/output.sumo

@@ -1,21 +1,20 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_20_0+1467-6b599642b49 started with time: 0.00.
-Simulation ended at time: 1016.00.
+Simulation version v1_20_0+1468-bcc53941aad started with time: 0.00.
+Simulation ended at time: 1013.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.02s
- Real time factor: 67733.3
- UPS: 461533.333333
+ Real time factor: 46045.5
+ UPS: 312136.363636
 Vehicles:
  Inserted: 400
  Running: 0
  Waiting: 0
- Emergency Braking: 21
 Statistics (avg of 400):
  RouteLength: 212.35
- Speed: 12.29
- Duration: 17.31
+ Speed: 12.38
+ Duration: 17.17
  WaitingTime: 0.01
- TimeLoss: 1.54
+ TimeLoss: 1.40
  DepartDelay: 0.04

tests/sumo/junction_model/junction_type/zipper/variations_dense/output.sumo

@@ -1,20 +1,20 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (0ms).
 Loading done.
-Simulation version v1_14_1+0331-153d228 started with time: 0.00.
+Simulation version v1_20_0+1468-bcc53941aad started with time: 0.00.
 Simulation ended at time: 1005.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.07s
- Real time factor: 14154.9
- UPS: 59422.535211
+ Duration: 0.02s
+ Real time factor: 55833.3
+ UPS: 234888.888889
 Vehicles:
  Inserted: 500
  Running: 0
  Waiting: 0
 Statistics (avg of 500):
  RouteLength: 210.38
- Speed: 25.65
- Duration: 8.44
+ Speed: 25.58
+ Duration: 8.46
  WaitingTime: 0.00
- TimeLoss: 1.44
+ TimeLoss: 1.45
  DepartDelay: 0.00

tests/sumo/junction_model/junction_type/zipper/variations_dense_adaptDist_50/output.sumo

@@ -1,20 +1,20 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
+Loading net-file from 'net.net.xml' ... done (0ms).
 Loading done.
-Simulation version v1_14_1+0331-153d228 started with time: 0.00.
+Simulation version v1_20_0+1468-bcc53941aad started with time: 0.00.
 Simulation ended at time: 1005.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.06s
- Real time factor: 15952.4
- UPS: 67317.460317
+ Duration: 0.03s
+ Real time factor: 38653.8
+ UPS: 165230.769231
 Vehicles:
  Inserted: 500
  Running: 0
  Waiting: 0
 Statistics (avg of 500):
  RouteLength: 210.38
- Speed: 25.56
- Duration: 8.48
+ Speed: 25.32
+ Duration: 8.59
  WaitingTime: 0.00
- TimeLoss: 1.48
+ TimeLoss: 1.58
  DepartDelay: 0.00

tests/sumo/junction_model/junction_type/zipper/variations_highspeed/output.sumo

@@ -1,20 +1,20 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_14_1+0331-153d228 started with time: 0.00.
+Simulation version v1_20_0+1468-bcc53941aad started with time: 0.00.
 Simulation ended at time: 1003.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.05s
- Real time factor: 18574.1
- UPS: 52055.555556
+ Duration: 0.02s
+ Real time factor: 66866.7
+ UPS: 188000.000000
 Vehicles:
  Inserted: 400
  Running: 0
  Waiting: 0
 Statistics (avg of 400):
  RouteLength: 211.01
- Speed: 30.30
- Duration: 7.03
+ Speed: 30.21
+ Duration: 7.05
  WaitingTime: 0.00
- TimeLoss: 0.47
+ TimeLoss: 0.49
  DepartDelay: 0.00