patching expected results refs #21, #7578

eclipse-sumo · Oct 14, 2024 · fce5969 · fce5969
1 parent 3bed8c2
commit fce5969
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 25 deletions.
diff --git a/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalblocks.sumo b/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-14 09:38:42 by Eclipse SUMO sumo Version v1_20_0+0640-665dcbc2332
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -47,8 +47,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":A_0_0 -b_0 :B_0_0 -c_0 :C_1_0"
                     deadlockCheck="-d_0 :D_0_0 -e_0 e_0 :D_1_0 d_0 :C_3_0 c2_0 :J5_1_0 b2_0"/>
                 <flank lanes=""/>
-                <conflictLinks signals="B_0"/>
-                <foes driveWays="A.0 B.0"/>
+                <conflictLinks signals=""/>
+                <foes driveWays="A.0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -58,7 +58,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <forward lanes=":B_1_0 c_0 :C_2_0 d_0"/>
                 <bidi lanes=":B_0_0 -c_0 :C_1_0 -d_0 :D_0_0 -e_0 e_0 :D_1_0 d_0 :C_3_0 c2_0 :J5_1_0 b2_0"/>
                 <flank lanes=""/>
-                <conflictLinks signals="A_0"/>
+                <conflictLinks signals=""/>
                 <foes driveWays="B.0 D.0.0"/>
             </driveWay>
         </link>

diff --git a/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo
@@ -3,7 +3,7 @@
         <driveWay id="A.0">
             <entry id="t0" time="20.00" reason="1"/>
             <exit id="t0" time="40.00" reason="1"/>
-            <entry id="t1" time="74.00" reason="1"/>
+            <entry id="t1" time="48.00" reason="1"/>
             <exit id="t1" time="123.00" reason="1"/>
         </driveWay>
     </link>
@@ -39,6 +39,6 @@
         <entry id="t0" time="0.00" reason="0"/>
         <exit id="t0" time="28.00" reason="1"/>
         <entry id="t1" time="28.00" reason="0"/>
-        <exit id="t1" time="91.00" reason="1"/>
+        <exit id="t1" time="56.00" reason="1"/>
     </driveWay>
 </departJunction>
diff --git a/tests/sumo/rail/reversal/consecutive_before_reversal/tripinfos.sumo b/tests/sumo/rail/reversal/consecutive_before_reversal/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-14 09:38:42 by Eclipse SUMO sumo Version v1_20_0+0640-665dcbc2332
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -41,5 +41,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="131.00" arrivalLane="-b2_0" arrivalPos="99.34" arrivalSpeed="8.38" duration="131.00" routeLength="891.44" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="62.45" 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="217.00" arrivalLane="-b2_0" arrivalPos="99.34" arrivalSpeed="8.13" duration="189.00" routeLength="891.44" waitingTime="26.00" waitingCount="3" stopTime="0.00" timeLoss="120.46" rerouteNo="1" devices="tripinfo_t1 routing_t1" 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="217.00" arrivalLane="-b2_0" arrivalPos="99.34" arrivalSpeed="8.13" duration="189.00" routeLength="891.44" waitingTime="40.00" waitingCount="2" stopTime="0.00" timeLoss="120.46" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
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-25 13:36:24 by Eclipse SUMO sumo Version v1_20_0+0593-8dcc4e49145
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -25,6 +25,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <processing>
         <time-to-teleport value="1000"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -165,8 +166,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <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"
                     deadlockCheck="S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0 S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0 F_11514-11506_0 :11514_2_0 F_SectionLink_11322-11515_0 :SectionLink_11322_2_0 F_SectionLink_11326-11324_0 :SectionLink_11326_3_0 F_11551-SectionLink_11326_0 :11551_2_0 F_SectionLink_11329-11552_0 :SectionLink_11329_3_0 F_11339-11336_0 :11339_1_0 F_11347-11343_0 :11347_1_0 F_14067-11347_0 :14067_1_0 F_14072-14067_0 :14072_1_0 F_SectionLink_14049-14079_0 :SectionLink_14049_3_0 F_14054-14052_0 :14054_1_0 F_14061-14054_0"/>
             <flank lanes=""/>
-            <conflictLinks signals="14092_0"/>
-            <foes driveWays="14092.1 14101.d0 14101.d1"/>
+            <conflictLinks signals=""/>
+            <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">
             <forward lanes="F_14101-14092_0"/>

diff --git a/tests/sumo/rail/reversal/follower_ends_before_reversal2/railsignalblocks.sumo b/tests/sumo/rail/reversal/follower_ends_before_reversal2/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -25,6 +25,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <processing>
         <time-to-teleport value="1000"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -147,7 +148,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":14092_0_0 S_14090-14092_0 :14090_0_0 S_SectionLink_14049-14090_0 :SectionLink_14049_1_0 S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0"
                     deadlockCheck="S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0"/>
                 <flank lanes=""/>
-                <conflictLinks signals="11339_0 11514_0 14114_0"/>
+                <conflictLinks signals="11339_0 11514_0"/>
                 <foes driveWays="11339.0 11514.0 11551.0 14072.0.0 14092.0 14092.1"/>
             </driveWay>
             <subDriveWay id="14092.1.0" vehicle="" edges="F_14092-14090 F_14090-SectionLink_14049 F_SectionLink_14049-14079">
@@ -180,7 +181,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0 S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0 F_11514-11506_0 :11514_2_0 F_SectionLink_11322-11515_0 :SectionLink_11322_2_0 F_SectionLink_11326-11324_0 :SectionLink_11326_3_0 F_11551-SectionLink_11326_0 :11551_2_0 F_SectionLink_11329-11552_0 :SectionLink_11329_3_0 F_11339-11336_0 :11339_1_0 F_11347-11343_0 :11347_1_0 F_14067-11347_0 :14067_1_0 F_14072-14067_0 :14072_1_0 F_SectionLink_14049-14079_0 :SectionLink_14049_2_0 F_14090-SectionLink_14049_0 :14090_1_0 F_14092-14090_0 :14092_1_0 F_14101-14092_0 :14101_2_0 F_14104-14101_0 :14104_1_0 F_SectionLink_14066-14104_0 :SectionLink_14066_2_0 F_14114-14111_0 :14114_1_0 E0_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="11339_0 11514_0 11551_0 14072_0 14092_0"/>
-                <foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14092.1 14101.0.0 14114.0 14114.1 14114.d0 J0.d1"/>
+                <foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14101.0.0 14114.0 14114.1 14114.d0 J0.d1"/>
             </driveWay>
             <subDriveWay id="14114.0.0" vehicle="" edges="F_14114-14111 F_SectionLink_14066-14104 F_14104-14101">
                 <forward lanes=":14114_1_0 F_14114-14111_0 :SectionLink_14066_2_0 F_SectionLink_14066-14104_0 :14104_1_0 F_14104-14101_0 :14101_2_0"/>
@@ -215,7 +216,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0 S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0 F_11514-11506_0 :11514_2_0 F_SectionLink_11322-11515_0 :SectionLink_11322_2_0 F_SectionLink_11326-11324_0 :SectionLink_11326_3_0 F_11551-SectionLink_11326_0 :11551_2_0 F_SectionLink_11329-11552_0 :SectionLink_11329_3_0 F_11339-11336_0 :11339_1_0 F_11347-11343_0 :11347_1_0 F_14067-11347_0 :14067_1_0 F_14072-14067_0 :14072_1_0 F_SectionLink_14049-14079_0 :SectionLink_14049_2_0 F_14090-SectionLink_14049_0 :14090_1_0 F_14092-14090_0 :14092_1_0 F_14101-14092_0 :14101_2_0 F_14104-14101_0 :14104_1_0 F_SectionLink_14066-14104_0 :SectionLink_14066_2_0 F_14114-14111_0 :14114_1_0 E0_0"/>
             <flank lanes=""/>
             <conflictLinks signals="11339_0 11514_0 11551_0 14072_0 14092_0 14114_0"/>
-            <foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14092.1 14101.0.1 14114.0 14114.1 14114.d0 J0.d1"/>
+            <foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14101.0.1 14114.0 14114.1 14114.d0 J0.d1"/>
         </driveWay>
         <subDriveWay id="14114.d0.0" vehicle="" edges="F_14114-14111 F_SectionLink_14066-14104 F_14104-14101">
             <forward lanes="F_14114-14111_0 :SectionLink_14066_2_0 F_SectionLink_14066-14104_0 :14104_1_0 F_14104-14101_0 :14101_2_0"/>

diff --git a/tests/sumo/rail/reversal/insertion_before_reversal2/railsignalblocks.sumo b/tests/sumo/rail/reversal/insertion_before_reversal2/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -119,7 +120,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
             <flank lanes=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J3.0 J4.0"/>
+            <foes driveWays="J0.d0 J0.d1 J1.0 J2.0 J3.0 J4.0"/>
         </driveWay>
         <driveWay id="J0.d1" vehicle="v_1" edges="E0 E1 E2 E3 E4">
             <forward lanes="E0_0"/>

diff --git a/tests/sumo/rail/reversal/insertion_before_reversal3/railsignalblocks.sumo b/tests/sumo/rail/reversal/insertion_before_reversal3/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -119,7 +120,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
             <flank lanes=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J3.0 J4.0"/>
+            <foes driveWays="J0.d0 J0.d1 J1.0 J2.0 J3.0 J4.0"/>
         </driveWay>
         <driveWay id="J0.d1" vehicle="v_1" edges="E0 E1 E2 E3 E4">
             <forward lanes="E0_0"/>

diff --git a/tests/sumo/rail/reversal/reversal_after_common_block/railsignalblocks.sumo b/tests/sumo/rail/reversal/reversal_after_common_block/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -47,7 +48,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="-g_0 :G_0_0 -h_0 h_0 :G_1_0 g_0 :F_2_0 f_0 :E_2_0 e_0 :D_1_0 d_0 :C_2_0 c_0 :B_2_0 b_0 :A_1_0 a_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="A2_0 C_0 E_0 G_0"/>
-                <foes driveWays="A.0 A2.0 C.0 C.1 E.0 G.0.0 J0.d0"/>
+                <foes driveWays="A.0 A2.0 C.0 E.0 G.0.0 J0.d0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -78,7 +79,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":C_0_0 -d_0 :D_0_0 -e_0 :E_0_0 -f_0 :F_1_0"
                     deadlockCheck="-g_0 :G_0_0 -h_0 h_0 :G_1_0 g_0 :F_3_0 f2_0"/>
                 <flank lanes=""/>
-                <conflictLinks signals="A_0 E_0 G_0"/>
+                <conflictLinks signals="E_0 G_0"/>
                 <foes driveWays="C.0 C.1 E.0 G.0.1"/>
             </driveWay>
         </link>
@@ -153,7 +154,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="-c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_0_0 -f_0 :F_1_0 -g_0 :G_0_0 -h_0 h_0 :G_1_0 g_0 :F_2_0 f_0 :E_2_0 e_0 :D_1_0 d_0 :C_2_0 c_0 :B_2_0 b_0 :A_1_0 a_0"/>
             <flank lanes=""/>
             <conflictLinks signals="A2_0 A_0 C_0 E_0 G_0"/>
-            <foes driveWays="A.0 A2.0 C.0 C.1 E.0 G.0 J0.d0"/>
+            <foes driveWays="A.0 A2.0 C.0 E.0 G.0 J0.d0"/>
         </driveWay>
     </departJunction>
     <departJunction id="J1">

diff --git a/tests/sumo/rail/reversal/two_double_reversals/railsignalblocks.sumo b/tests/sumo/rail/reversal/two_double_reversals/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-26 22:58:51 by Eclipse SUMO sumo Version v1_20_0+0608-d1da7d7d312
+<!-- generated on 2024-10-14 12:37:25 by Eclipse SUMO sumo Version v1_20_0+0641-8aff895acb8
 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
@@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -97,7 +98,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <forward lanes="a_0"/>
             <bidi lanes="-a_0 :A_0_0 -b_0 :B_0_0 -c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_0_0 -f_0 f_0 -f_0 :F_0_0 -g_0"/>
             <flank lanes=""/>
-            <conflictLinks signals="A_0"/>
+            <conflictLinks signals=""/>
             <foes driveWays="J0.d0 J0.d1"/>
         </driveWay>
         <driveWay id="J0.d1" vehicle="t1" edges="a b c d -d d e f g">