patching expected results refs eclipse-sumo#21, eclipse-sumo#12924

carla-simulator · Mar 28, 2023 · ddb0966 · ddb0966
1 parent 2ec6f0f
commit ddb0966
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/tests/sumo/extended/bidiEdge/TWLT/errors.sumo b/tests/sumo/extended/bidiEdge/TWLT/errors.sumo
@@ -1,4 +1 @@
-Warning: Teleporting vehicle 'v_0'; waited too long (yield), lane='E1_1', time=310.00.
-Warning: Teleporting vehicle 'v_1'; waited too long (yield), lane='-E1_1', time=310.00.
-Warning: Vehicle 'v_0' ends teleporting on edge 'E4', time=310.00.
-Warning: Vehicle 'v_1' ends teleporting on edge 'E3', time=310.00.
+Warning: Vehicle 'v_0'; frontal collision with vehicle 'v_1', lane='E1_1', gap=-26.20, time=12.00 stage=laneChange.
diff --git a/tests/sumo/extended/bidiEdge/TWLT/options.sumo b/tests/sumo/extended/bidiEdge/TWLT/options.sumo
@@ -1,2 +1,3 @@
 --no-step-log --net-file=net.net.xml --routes=input_routes.rou.xml
 --tripinfo-output tripinfos.xml
+--collision.action warn
diff --git a/tests/sumo/extended/bidiEdge/TWLT/tripinfos.sumo b/tests/sumo/extended/bidiEdge/TWLT/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-27 16:28:52 by Eclipse SUMO sumo Version v1_16_0+1685-995fee9
+<!-- generated on 2023-03-28 10:28:42 by Eclipse SUMO sumo Version v1_16_0+1714-762aef0
 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
@@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <collision.action value="warn"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -36,6 +37,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="v_0" depart="0.00" departLane="E0_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="313.00" arrivalLane="E4_0" arrivalPos="41.20" arrivalSpeed="13.46" duration="313.00" routeLength="128.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="305.19" rerouteNo="0" devices="tripinfo_v_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="v_1" depart="0.00" departLane="-E2_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="313.00" arrivalLane="E3_0" arrivalPos="41.20" arrivalSpeed="13.74" duration="313.00" routeLength="128.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="305.21" rerouteNo="0" devices="tripinfo_v_1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v_0" depart="0.00" departLane="E0_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="19.00" arrivalLane="E4_0" arrivalPos="41.20" arrivalSpeed="12.69" duration="19.00" routeLength="143.10" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="7.63" rerouteNo="0" devices="tripinfo_v_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v_1" depart="0.00" departLane="-E2_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="21.00" arrivalLane="E3_0" arrivalPos="41.20" arrivalSpeed="13.26" duration="21.00" routeLength="143.10" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.16" rerouteNo="0" devices="tripinfo_v_1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
 </tripinfos>