patching expected results refs #21, #14543

eclipse-sumo · Oct 15, 2024 · 678e9d1 · 678e9d1
1 parent a4db70a
commit 678e9d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/tests/sumo/rail/rail_signal/constraints/deadlock_remove/deadlocks.sumo b/tests/sumo/rail/rail_signal/constraints/deadlock_remove/deadlocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-15 11:50:54 by Eclipse SUMO sumo Version v1_20_0+0662-36f48e67704
+<!-- generated on 2024-10-15 12:19:28 by Eclipse SUMO sumo Version v1_20_0+0665-7d9ea4f130b
 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
@@ -27,6 +27,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <time-to-teleport.remove-constraint value="true"/>
         <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
@@ -41,5 +42,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <constraintDeadlock time="231.00" signals="A D" vehicles="t1 t0" tripIds="t1 t0"/>
+    <constraintDeadlock time="231.00" signals="A D" vehicles="t1 t0" tripIds="t1 t0">
+        <resolvedConstraint id="A">
+            <predecessor tripId="t0" tl="D" foes="t1" active="0"/>
+        </resolvedConstraint>
+    </constraintDeadlock>
 </additional>
diff --git a/tests/sumo/rail/rail_signal/constraints/deadlock_remove/errors.sumo b/tests/sumo/rail/rail_signal/constraints/deadlock_remove/errors.sumo
@@ -1,2 +1 @@
-Warning: Teleporting vehicle 't0'; waited too long (yield, railSignal), lane='a_0', time=231.00.
-Warning: Vehicle 't0' ends teleporting on edge 'b', time=231.00.
+Warning: Deactivating constraint to resolve deadlock between tripIds t1 t0 at time 231.00.
diff --git a/tests/sumo/rail/rail_signal/constraints/deadlock_remove/tripinfos.sumo b/tests/sumo/rail/rail_signal/constraints/deadlock_remove/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-15 11:50:10 by Eclipse SUMO sumo Version v1_20_0+0662-36f48e67704
+<!-- generated on 2024-10-15 11:59:15 by Eclipse SUMO sumo Version v1_20_0+0665-7d9ea4f130b
 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
@@ -23,9 +23,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
     </output>
 
     <processing>
+        <time-to-teleport.remove-constraint value="true"/>
         <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
@@ -40,6 +42,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="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="264.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="264.00" routeLength="849.90" waitingTime="201.00" waitingCount="1" stopTime="0.00" timeLoss="205.88" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="20.00" departLane="d_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="298.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="278.00" routeLength="891.19" waitingTime="181.00" waitingCount="1" stopTime="0.00" timeLoss="213.16" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="295.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="295.00" routeLength="849.90" waitingTime="201.00" waitingCount="1" stopTime="0.00" timeLoss="233.16" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="20.00" departLane="d_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="362.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="342.00" routeLength="891.19" waitingTime="245.00" waitingCount="1" stopTime="0.00" timeLoss="277.16" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>