patching expected results refs #21, #7578

eclipse-sumo · Oct 11, 2024 · b2dc6c9 · b2dc6c9
1 parent 78e4e34
commit b2dc6c9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalblocks.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-25 15:10:35 by Eclipse SUMO sumo Version v1_20_0+0597-36c9673207a
+<!-- generated on 2024-10-11 12:14:35 by Eclipse SUMO sumo Version v1_20_0+0636-3016b45a628
 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
 
     <processing>
         <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
         <use-stop-ended value="true"/>
     </processing>
@@ -59,7 +60,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":J3_0_0 -E3_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="J3.0 J3.d2 J4.d0"/>
+                <foes driveWays="J3.0 J3.1 J3.d2 J4.d0"/>
+            </driveWay>
+            <driveWay id="J3.1" vehicle="v2" edges="E3 -E3 E3">
+                <forward lanes=":J3_2_0 E3_0 :J4_1_0 -E3_0 :J3_1_0 E3_0"/>
+                <bidi lanes=":J3_0_0 -E3_0 E3_0 -E3_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals="J3_0"/>
+                <foes driveWays="J3.0 J3.1 J3.d2 J4.d0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -80,7 +88,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="E3_0 -E3_0"/>
             <flank lanes=""/>
             <conflictLinks signals="J3_0"/>
-            <foes driveWays="J3.0 J3.d2 J4.d0"/>
+            <foes driveWays="J3.0 J3.1 J3.d2 J4.d0"/>
         </driveWay>
     </departJunction>
     <departJunction id="J0">
@@ -98,7 +106,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="-E3_0 E3_0 -E3_0"/>
             <flank lanes=""/>
             <conflictLinks signals="J3_0"/>
-            <foes driveWays="J3.0 J3.d2 J4.d0"/>
+            <foes driveWays="J3.0 J3.1 J3.d2 J4.d0"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
@@ -12,6 +12,7 @@
             <entry id="v1" time="142.00" reason="1"/>
             <exit id="v1" time="174.00" reason="1"/>
         </driveWay>
+        <driveWay id="J3.1"/>
     </link>
 </railSignal>
 <railSignal id="J4">

diff --git a/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo
@@ -9,28 +9,24 @@
             <exit id="t0" time="57.00" reason="1"/>
             <entry id="t1" time="67.00" reason="1"/>
             <exit id="t1" time="119.00" reason="1"/>
-            <entry id="t2" time="197.00" reason="1"/>
-            <exit id="t2" time="249.00" reason="1"/>
+            <entry id="t2" time="162.00" reason="1"/>
+            <exit id="t2" time="214.00" reason="1"/>
         </subDriveWay>
         <subDriveWay id="A.0.1">
             <entry id="t0" time="20.00" reason="1"/>
             <exit id="t0" time="64.00" reason="1"/>
-            <entry id="t1" time="67.00" reason="1"/>
-            <exit id="t1" time="194.00" reason="9"/>
-            <entry id="t2" time="197.00" reason="1"/>
-            <exit id="t2" time="324.00" reason="9"/>
         </subDriveWay>
         <driveWay id="A.1">
             <entry id="t1" time="67.00" reason="1"/>
             <exit id="t1" time="145.00" reason="1"/>
-            <entry id="t2" time="197.00" reason="1"/>
-            <exit id="t2" time="275.00" reason="1"/>
+            <entry id="t2" time="162.00" reason="1"/>
+            <exit id="t2" time="240.00" reason="1"/>
         </driveWay>
         <subDriveWay id="A.1.0">
             <entry id="t1" time="67.00" reason="1"/>
             <exit id="t1" time="119.00" reason="1"/>
-            <entry id="t2" time="197.00" reason="1"/>
-            <exit id="t2" time="249.00" reason="1"/>
+            <entry id="t2" time="162.00" reason="1"/>
+            <exit id="t2" time="214.00" reason="1"/>
         </subDriveWay>
     </link>
 </railSignal>
@@ -39,14 +35,14 @@
         <driveWay id="D.0">
             <entry id="t1" time="131.00" reason="1"/>
             <exit id="t1" time="194.00" reason="9"/>
-            <entry id="t2" time="261.00" reason="1"/>
-            <exit id="t2" time="324.00" reason="9"/>
+            <entry id="t2" time="226.00" reason="1"/>
+            <exit id="t2" time="289.00" reason="9"/>
         </driveWay>
         <subDriveWay id="D.0.0">
             <entry id="t1" time="131.00" reason="1"/>
             <exit id="t1" time="159.00" reason="1"/>
-            <entry id="t2" time="261.00" reason="1"/>
-            <exit id="t2" time="289.00" reason="1"/>
+            <entry id="t2" time="226.00" reason="1"/>
+            <exit id="t2" time="254.00" reason="1"/>
         </subDriveWay>
     </link>
 </railSignal>
@@ -59,6 +55,6 @@
         <entry id="t1" time="28.00" reason="0"/>
         <exit id="t1" time="84.00" reason="1"/>
         <entry id="t2" time="84.00" reason="0"/>
-        <exit id="t2" time="214.00" reason="1"/>
+        <exit id="t2" time="179.00" reason="1"/>
     </driveWay>
 </departJunction>
diff --git a/tests/sumo/rail/reversal/subdriveway_reversal/tripinfos.sumo b/tests/sumo/rail/reversal/subdriveway_reversal/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-11 11:35:42 by Eclipse SUMO sumo Version v1_20_0+0634-d1c27797553
+<!-- generated on 2024-10-11 12:14:35 by Eclipse SUMO sumo Version v1_20_0+0636-3016b45a628
 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
@@ -42,5 +42,5 @@ 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="0.00" departDelay="0.00" arrival="75.00" arrivalLane="g_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="75.00" routeLength="650.41" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="27.28" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="t1" depart="28.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="28.00" arrival="194.00" arrivalLane="-a2_0" arrivalPos="100.00" arrivalSpeed="10.88" duration="166.00" routeLength="991.54" waitingTime="17.00" waitingCount="2" stopTime="0.00" timeLoss="104.05" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t2" depart="84.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="84.00" arrival="324.00" arrivalLane="-a2_0" arrivalPos="100.00" arrivalSpeed="10.88" duration="240.00" routeLength="991.54" waitingTime="91.00" waitingCount="2" stopTime="0.00" timeLoss="178.05" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="84.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="84.00" arrival="289.00" arrivalLane="-a2_0" arrivalPos="100.00" arrivalSpeed="10.88" duration="205.00" routeLength="991.54" waitingTime="56.00" waitingCount="2" stopTime="0.00" timeLoss="143.05" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>