patching expected results. refs #12, #7578

eclipse-sumo · Sep 11, 2024 · a08a3ca · a08a3ca
1 parent 2f76013
commit a08a3ca
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 47 deletions.
diff --git a/tests/sumo/rail/bugs/ticket12858/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket12858/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-05 13:49:10 by Eclipse SUMO sumo Version v1_20_0+0527-5e4c9ee5dc8
+<!-- generated on 2024-09-11 11:38:15 by Eclipse SUMO sumo Version v1_20_0+0560-666cfc249e9
 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
@@ -126,7 +126,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="1007_0" to="1006_0"/>
     </railSignal>
     <departJunction id="3">
-        <driveWay id="3.d0" vehicle="v_0" edges="1003 1002 1031 1001 1000 1013 1012 1034 1017 1033 1011" core="2">
+        <driveWay id="3.d0" vehicle="v_0" edges="1003 1002 1031 1001 1000 1013 1012 1034 1017 1033 1011 1051 1052 1075 1058 1077 1053 1054 1043 1044 1072 1047 1048" core="2">
             <forward lanes="1003_0"/>
             <bidi lanes="1045_0 1071_0"/>
             <flank lanes=""/>

diff --git a/tests/sumo/rail/reversal/follower_ends_before_reversal/railsignalblocks.sumo b/tests/sumo/rail/reversal/follower_ends_before_reversal/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-05 13:49:10 by Eclipse SUMO sumo Version v1_20_0+0527-5e4c9ee5dc8
+<!-- generated on 2024-09-11 11:38:15 by Eclipse SUMO sumo Version v1_20_0+0560-666cfc249e9
 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
@@ -167,13 +167,21 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="E0_0" to=":14114_1_0"/>
     </railSignal>
     <departJunction id="14101">
-        <driveWay id="14101.d0" vehicle="v_0" edges="F_14101-14092 F_14092-14090 F_14090-SectionLink_14049 F_SectionLink_14049-14079 F_14072-14067 F_14067-11347 F_11347-11343 F_11339-11336 F_SectionLink_11329-11552 F_11551-SectionLink_11326 F_SectionLink_11326-11324 F_SectionLink_11322-11515 F_11514-11506" core="3">
+        <driveWay id="14101.d0" vehicle="v_0" edges="F_14101-14092 F_14092-14090 F_14090-SectionLink_14049 F_SectionLink_14049-14079 F_14072-14067 F_14067-11347 F_11347-11343 F_11339-11336 F_SectionLink_11329-11552 F_11551-SectionLink_11326 F_SectionLink_11326-11324 F_SectionLink_11322-11515 F_11514-11506 S_11506-11514 S_11514-11515 S_SectionLink_11322-11324 S_SectionLink_11326-11551 S_11551-11552 S_SectionLink_11329-11332 S_11339-11342 S_11347-14067 S_14067-14072 S_14072-14077 S_SectionLink_14049-14051 S_14054-14061" core="3">
             <forward lanes="F_14101-14092_0"/>
             <bidi lanes="S_14092-14101_0 :14092_0_0 S_14090-14092_0 :14090_0_0 S_SectionLink_14049-14090_0 :SectionLink_14049_1_0"/>
             <flank lanes=":14101_2_0 F_14104-14101_0 :14104_1_0 F_SectionLink_14066-14104_0 :SectionLink_14066_2_0"/>
             <protectingSwitches links="SectionLink_14066_2"/>
             <conflictLinks signals=""/>
-            <foes driveWays="14101.d0"/>
+            <foes driveWays="14101.d0 14101.d1"/>
+        </driveWay>
+        <driveWay id="14101.d1" vehicle="v_1" edges="F_14101-14092 F_14092-14090 F_14090-SectionLink_14049 F_SectionLink_14049-14079 F_14072-14067 F_14067-11347 F_11347-11343 F_11339-11336 F_SectionLink_11329-11552 F_11551-SectionLink_11326 F_SectionLink_11326-11324 F_SectionLink_11322-11515 F_11514-11506" core="3">
+            <forward lanes="F_14101-14092_0"/>
+            <bidi lanes="S_14092-14101_0 :14092_0_0 S_14090-14092_0 :14090_0_0 S_SectionLink_14049-14090_0 :SectionLink_14049_1_0"/>
+            <flank lanes=":14101_2_0 F_14104-14101_0 :14104_1_0 F_SectionLink_14066-14104_0 :SectionLink_14066_2_0"/>
+            <protectingSwitches links="SectionLink_14066_2"/>
+            <conflictLinks signals=""/>
+            <foes driveWays="14101.d0 14101.d1"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>
diff --git a/tests/sumo/rail/reversal/reversal_onRoute_beyond_core/railsignalblocks.sumo b/tests/sumo/rail/reversal/reversal_onRoute_beyond_core/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-05 15:15:43 by Eclipse SUMO sumo Version v1_20_0+0530-82f617b994a
+<!-- generated on 2024-09-11 11:38:15 by Eclipse SUMO sumo Version v1_20_0+0560-666cfc249e9
 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
@@ -50,7 +50,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             </driveWay>
         </link>
         <link linkIndex="1" from="E0_0" to=":J1_1_0">
-            <driveWay id="J1.0" vehicle="v_0" edges="E1 E5 E6 E7 E4" core="4">
+            <driveWay id="J1.0" vehicle="v_0" edges="E1 E5 E6 E7 E4 -E4 -E3 -E2 -E1 -E0" core="4">
                 <forward lanes=":J1_1_0 E1_0 :J2_2_0 E5_0 :J6_1_0 E6_0"/>
                 <bidi lanes=":J1_0_0 -E1_0 :J2_1_0 -E5_0 :J6_0_0 -E6_0 :J7_0_0 -E7_0 :J4_1_0"/>
                 <flank lanes=":J2_0_0 -E2_0 :J3_0_0"/>
@@ -89,7 +89,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         </link>
     </railSignal>
     <departJunction id="J0">
-        <driveWay id="J0.d0" vehicle="v_0" edges="E0 E1 E5 E6 E7 E4" core="5">
+        <driveWay id="J0.d0" vehicle="v_0" edges="E0 E1 E5 E6 E7 E4 -E4 -E3 -E2 -E1 -E0" core="5">
             <forward lanes="E0_0"/>
             <bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_1_0 -E5_0 :J6_0_0 -E6_0 :J7_0_0 -E7_0 :J4_1_0"/>
             <flank lanes=":J2_0_0 -E2_0 :J3_0_0"/>

diff --git a/tests/sumo/rail/reversal/routes_cross_twice/errors.sumo b/tests/sumo/rail/reversal/routes_cross_twice/errors.sumo
@@ -1,4 +0,0 @@
-Warning: Teleporting vehicle 't1'; waited too long (yield), lane='b2_0', time=339.00.
-Warning: Teleporting vehicle 't0'; waited too long (yield), lane='b_0', time=339.00.
-Warning: Vehicle 't0' ends teleporting on edge 'c', time=339.00.
-Warning: Vehicle 't1' ends teleporting on edge 'c2', time=339.00.

diff --git a/tests/sumo/rail/reversal/routes_cross_twice/railsignalblocks.sumo b/tests/sumo/rail/reversal/routes_cross_twice/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-10 12:23:05 by Eclipse SUMO sumo Version v1_20_0+0554-57e2d1b90b3
+<!-- generated on 2024-09-11 11:38:15 by Eclipse SUMO sumo Version v1_20_0+0560-666cfc249e9
 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
@@ -66,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <flank lanes="-e_0 c_0"/>
                 <protectingSwitches links=""/>
                 <conflictLinks signals="B_0 E_0"/>
-                <foes driveWays="B.0.1 B2.0 E.0.1 E2.0.1"/>
+                <foes driveWays="B.0.1 B2.0 E.0.1 E2.0.1 gneJ1.d0"/>
             </driveWay>
             <subDriveWay id="B2.0.0" vehicle="" edges="c2 d">
                 <forward lanes="c2_0 d_0"/>
@@ -113,14 +113,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         </link>
     </railSignal>
     <departJunction id="gneJ1">
-        <driveWay id="gneJ1.d0" vehicle="" edges="a b c d e f g">
+        <driveWay id="gneJ1.d0" vehicle="" edges="a b c d e f g -g -f -e -d -c2 -b2 -a2">
             <forward lanes="a_0 b_0"/>
             <bidi lanes="-a_0 -b_0 -c_0"
-                    deadlockCheck="-d_0 -e_0 -f_0 -g_0 -e2_0"/>
+                    deadlockCheck="-d_0 -e_0 -f_0 -g_0 g_0 f_0 e_0 d_0 c2_0 b2_0 a2_0 -e2_0"/>
             <flank lanes=""/>
             <protectingSwitches links="J2_1"/>
-            <conflictLinks signals="E2_0"/>
-            <foes driveWays="E2.0 gneJ1.d0"/>
+            <conflictLinks signals="B2_0 E2_0"/>
+            <foes driveWays="E2.0 gneJ1.d0 gneJ5.d1"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ5">
@@ -131,7 +131,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=""/>
             <protectingSwitches links="J2_0"/>
             <conflictLinks signals="B_0 E_0"/>
-            <foes driveWays="E.0 gneJ5.d1"/>
+            <foes driveWays="E.0 gneJ1.d0 gneJ5.d1"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>
diff --git a/tests/sumo/rail/reversal/routes_cross_twice/tripinfos.sumo b/tests/sumo/rail/reversal/routes_cross_twice/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-10 12:23:05 by Eclipse SUMO sumo Version v1_20_0+0554-57e2d1b90b3
+<!-- generated on 2024-09-11 11:38:15 by Eclipse SUMO sumo Version v1_20_0+0560-666cfc249e9
 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
@@ -38,6 +38,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="534.00" arrivalLane="-a2_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="534.00" routeLength="2591.32" waitingTime="303.00" waitingCount="2" stopTime="1.00" timeLoss="371.06" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="0.00" departLane="a2_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="587.00" arrivalLane="-a_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="587.00" routeLength="2674.16" waitingTime="340.00" waitingCount="3" stopTime="1.00" timeLoss="417.69" 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="-a2_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="295.00" routeLength="2591.32" waitingTime="2.00" waitingCount="1" stopTime="65.00" timeLoss="64.37" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="36.00" departLane="a2_0" departPos="50.10" departSpeed="13.89" departDelay="36.00" arrival="348.00" arrivalLane="-a_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="312.00" routeLength="2674.16" waitingTime="55.00" waitingCount="2" stopTime="23.00" timeLoss="117.33" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>