patching expected results refs #21, #15474, #15561

eclipse-sumo · Oct 15, 2024 · abe25e3 · abe25e3
1 parent ed88c09
commit abe25e3
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 91 deletions.
diff --git a/tests/sumo/rail/deadlocks/loop_4veh/railsignalblocks.sumo b/tests/sumo/rail/deadlocks/loop_4veh/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 20:52:17 by Eclipse SUMO sumo Version v1_20_0+0618-b88f2fd166e
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -22,9 +22,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.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -62,6 +64,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <conflictLinks signals="C2_0"/>
                 <foes driveWays="A.0 A.1 A.d3 B.d4 C.d5 C2.0.0 J0.d2"/>
                 <sidings foe="J0.d2">
+                    <siding start="c" end="d" length="194.64"/>
                     <siding start="c" end="-d2" length="572.91"/>
                 </sidings>
             </driveWay>
@@ -200,9 +203,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.1 A.d3 C2.0 J0.d0 J0.d2"/>
             <sidings foe="A.1">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
             <sidings foe="A.d3">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
         </driveWay>
@@ -216,6 +221,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.0 A.1 A.d3 B.d4 C.d5 C2.0.1 J0.d2"/>
             <sidings foe="J0.d2">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
         </driveWay>

diff --git a/tests/sumo/rail/deadlocks/loop_4veh2/railsignalblocks.sumo b/tests/sumo/rail/deadlocks/loop_4veh2/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-11 14:26:47 by Eclipse SUMO sumo Version v1_20_0+0638-b2dc6c989ae
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -64,6 +64,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <conflictLinks signals="C2_0"/>
                 <foes driveWays="A.0 A.1 A.d3 B.d4 C.d5 C2.0.0 J0.d1"/>
                 <sidings foe="J0.d1">
+                    <siding start="c" end="d" length="194.64"/>
                     <siding start="c" end="-d2" length="572.91"/>
                 </sidings>
             </driveWay>
@@ -202,9 +203,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.1 A.d3 C2.0 J0.d0 J0.d1"/>
             <sidings foe="A.1">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
             <sidings foe="A.d3">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
         </driveWay>
@@ -218,6 +221,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.0 A.1 A.d3 B.d4 C.d5 C2.0.1 J0.d1"/>
             <sidings foe="J0.d1">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
         </driveWay>

diff --git a/tests/sumo/rail/deadlocks_loadHints/loop_4veh/railsignalblocks.sumo b/tests/sumo/rail/deadlocks_loadHints/loop_4veh/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-14 17:24:10 by Eclipse SUMO sumo Version v1_20_0+0649-fb82daa8444
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -65,6 +65,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <conflictLinks signals="C2_0"/>
                 <foes driveWays="A.0 A.1 C2.0.0 J0.d2"/>
                 <sidings foe="J0.d2">
+                    <siding start="c" end="d" length="194.64"/>
                     <siding start="c" end="-d2" length="572.91"/>
                 </sidings>
             </driveWay>
@@ -204,6 +205,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.1 C2.0 J0.d0 J0.d2"/>
             <sidings foe="A.1">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
             <deadlock foes="A.0 G.0 I2.0"/>

diff --git a/tests/sumo/rail/deadlocks_loadHints/loop_4veh2/railsignalblocks.sumo b/tests/sumo/rail/deadlocks_loadHints/loop_4veh2/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-14 17:24:10 by Eclipse SUMO sumo Version v1_20_0+0649-fb82daa8444
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -65,6 +65,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <conflictLinks signals="C2_0"/>
                 <foes driveWays="A.0 A.1 C2.0.0 J0.d1"/>
                 <sidings foe="J0.d1">
+                    <siding start="c" end="d" length="194.64"/>
                     <siding start="c" end="-d2" length="572.91"/>
                 </sidings>
             </driveWay>
@@ -204,6 +205,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <conflictLinks signals="A_0 C2_0"/>
             <foes driveWays="A.1 C2.0 J0.d0 J0.d1"/>
             <sidings foe="A.1">
+                <siding start="c" end="d" length="194.64"/>
                 <siding start="c" end="-d2" length="572.91"/>
             </sidings>
             <deadlock foes="A.0 D.1 I2.0"/>

diff --git a/tests/sumo/rail/siding/long_siding_occupied_advance/errors.sumo b/tests/sumo/rail/siding/long_siding_occupied_advance/errors.sumo
@@ -1,8 +0,0 @@
-Warning: Teleporting vehicle 't2'; waited too long (yield, railSignal), lane='-g_0', time=261.00.
-Warning: Teleporting vehicle 't3'; waited too long (yield, railSignal), lane='E1_0', time=261.00.
-Warning: Vehicle 't2' ends teleporting on edge '-f', time=261.00.
-Warning: Vehicle 't3' ends teleporting on edge 'a', time=261.00.
-Warning: Teleporting vehicle 't0'; frontal collision with vehicle 't3', lane='a_0', gap=-1.00, time=313.00 stage=move.
-Warning: Vehicle 't0' ends teleporting on edge '-E1', time=313.00.
-Warning: Teleporting vehicle 't2'; frontal collision with vehicle 't3', lane='a_0', gap=-1.00, time=365.00 stage=move.
-Warning: Vehicle 't2' ends teleporting on edge '-E1', time=365.00.

diff --git a/tests/sumo/rail/siding/long_siding_occupied_advance/railsignalblocks.sumo b/tests/sumo/rail/siding/long_siding_occupied_advance/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-15 10:03:51 by Eclipse SUMO sumo Version v1_20_0+0655-ec4180a9659
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -49,6 +49,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <conflictLinks signals="F_0 J3_0"/>
                 <foes driveWays="A.0 G.d0 J3.0.1"/>
                 <sidings foe="G.d0">
+                    <siding start="c" end="c" length="194.64"/>
                     <siding start="c" end="d" length="294.64"/>
                 </sidings>
             </driveWay>
@@ -76,14 +77,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":D_0_0 -e_0 :E_1_0 -f_0 :F_0_0 -g_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="D.0 F.0.0 F.d4.0 G.d0"/>
+                <foes driveWays="D.0 F.0.0 G.d0"/>
             </driveWay>
             <subDriveWay id="D.0.0" vehicle="" edges="e f">
                 <forward lanes=":D_1_0 e_0 :E_2_0 f_0 :F_1_0"/>
             </subDriveWay>
-            <subDriveWay id="D.0.1" vehicle="" edges="e f">
-                <forward lanes=":D_1_0 e_0 :E_2_0 f_0"/>
-            </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="F">
@@ -94,14 +92,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="A_0 D_0 J0_0"/>
-                <foes driveWays="D.0.0 F.0 F.d4 J0.0 J0.d5 J5.d2"/>
+                <foes driveWays="D.0.0 F.0 J0.0 J5.d2"/>
                 <sidings foe="J0.0">
-                    <siding start="-e2" end="-d2" length="334.74"/>
-                </sidings>
-                <sidings foe="J0.d5">
+                    <siding start="-e2" end="-d2.0" length="234.74"/>
                     <siding start="-e2" end="-d2" length="334.74"/>
                 </sidings>
                 <sidings foe="J5.d2">
+                    <siding start="-e2" end="-d2.0" length="234.74"/>
                     <siding start="-e2" end="-d2" length="334.74"/>
                 </sidings>
             </driveWay>
@@ -118,8 +115,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="-f_0 :F_0_0 -g_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="F_0 J3_0"/>
-                <foes driveWays="G.d0 J0.0 J0.d5 J3.0.0"/>
+                <foes driveWays="G.d0 J0.0 J3.0.0"/>
                 <sidings foe="G.d0">
+                    <siding start="c" end="c" length="194.64"/>
                     <siding start="c" end="d" length="294.64"/>
                 </sidings>
             </driveWay>
@@ -132,17 +130,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0 b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="A.0.0 J0.0 J0.d5 J0.d6 J3.0 J5.d2"/>
+                <foes driveWays="A.0.0 J0.0 J3.0 J5.d2"/>
             </driveWay>
             <subDriveWay id="J3.0.0" vehicle="" edges="-d20 -c2 -b -a">
                 <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0 -a_0 :J0_0_0"/>
             </subDriveWay>
             <subDriveWay id="J3.0.1" vehicle="" edges="-d20 -c2 -b">
                 <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0"/>
             </subDriveWay>
-            <subDriveWay id="J3.0.2" vehicle="" edges="-d20 -c2 -b -a">
-                <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0 -a_0"/>
-            </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="J6">
@@ -157,15 +152,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             </driveWay>
         </link>
     </railSignal>
-    <departJunction id="J0">
-        <driveWay id="J0.d6" vehicle="t0" edges="-E1">
-            <forward lanes="-E1_0"/>
-            <bidi lanes="E1_0"/>
-            <flank lanes=""/>
-            <conflictLinks signals="J3_0"/>
-            <foes driveWays="J0.d6 J3.0 J5.d2"/>
-        </driveWay>
-    </departJunction>
     <departJunction id="J6">
         <driveWay id="J6.d1" vehicle="t0" edges="-d2 -d20 -c2 -b -a -E1">
             <forward lanes="-d2_0"/>
@@ -176,43 +162,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <foes driveWays="J6.0 J6.d1"/>
         </driveWay>
     </departJunction>
-    <departJunction id="F">
-        <driveWay id="F.d4" vehicle="t2" edges="-f -e2 -d2.0 -d2 -d20 -c2 -b -a -E1">
-            <forward lanes="-f_0 :E_0_0 -e2_0 :D2_0_0 -d2.0_0"/>
-            <bidi lanes="f_0 :E_3_0 e2_0 :D2_1_0 d20_0 :J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0"
-                    deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
-            <flank lanes=""/>
-            <conflictLinks signals="A_0 D_0 F_0 J0_0"/>
-            <foes driveWays="D.0.1 F.0 F.d4 J0.0 J0.d5 J5.d2"/>
-            <sidings foe="J0.0">
-                <siding start="-e2" end="-d2" length="334.74"/>
-            </sidings>
-            <sidings foe="J0.d5">
-                <siding start="-e2" end="-d2" length="334.74"/>
-            </sidings>
-            <sidings foe="J5.d2">
-                <siding start="-e2" end="-d2" length="334.74"/>
-            </sidings>
-        </driveWay>
-        <subDriveWay id="F.d4.0" vehicle="" edges="-f">
-            <forward lanes="-f_0"/>
-        </subDriveWay>
-    </departJunction>
     <departJunction id="G">
         <driveWay id="G.d0" vehicle="t2" edges="-g -f -e2 -d2.0 -d2 -d20 -c2 -b -a -E1">
             <forward lanes="-g_0"/>
             <bidi lanes="g_0 :F_1_0 f_0 :E_3_0 e2_0 :D2_1_0 d20_0 :J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0"
                     deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
             <flank lanes=""/>
             <conflictLinks signals="A_0 D_0 J0_0"/>
-            <foes driveWays="D.0 G.d0 J0.0 J0.d5 J5.d2"/>
+            <foes driveWays="D.0 G.d0 J0.0 J5.d2"/>
             <sidings foe="J0.0">
-                <siding start="-e2" end="-d2" length="334.74"/>
-            </sidings>
-            <sidings foe="J0.d5">
+                <siding start="-e2" end="-d2.0" length="234.74"/>
                 <siding start="-e2" end="-d2" length="334.74"/>
             </sidings>
             <sidings foe="J5.d2">
+                <siding start="-e2" end="-d2.0" length="234.74"/>
                 <siding start="-e2" end="-d2" length="334.74"/>
             </sidings>
         </driveWay>
@@ -224,21 +187,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="-f_0 :F_0_0 -g_0"/>
             <flank lanes=""/>
             <conflictLinks signals="F_0 J3_0"/>
-            <foes driveWays="G.d0 J0.d6 J3.0 J5.d2"/>
-            <sidings foe="G.d0">
-                <siding start="c" end="d" length="294.64"/>
-            </sidings>
-        </driveWay>
-    </departJunction>
-    <departJunction id="J0">
-        <driveWay id="J0.d5" vehicle="t3" edges="a b c d e f g">
-            <forward lanes="a_0"/>
-            <bidi lanes="-a_0 :A_0_0 -b_0 :B_1_0 -c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_1_0"
-                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
-            <flank lanes=""/>
-            <conflictLinks signals="F_0 J0_0 J3_0"/>
-            <foes driveWays="G.d0 J0.0 J0.d5 J3.0.2"/>
+            <foes driveWays="G.d0 J3.0 J5.d2"/>
             <sidings foe="G.d0">
+                <siding start="c" end="c" length="194.64"/>
                 <siding start="c" end="d" length="294.64"/>
             </sidings>
         </driveWay>

diff --git a/tests/sumo/rail/siding/long_siding_occupied_advance/tripinfos.sumo b/tests/sumo/rail/siding/long_siding_occupied_advance/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-15 10:03:51 by Eclipse SUMO sumo Version v1_20_0+0655-ec4180a9659
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
 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
@@ -39,8 +39,8 @@ 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="-d2_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="324.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="324.00" routeLength="690.93" waitingTime="2.00" waitingCount="1" stopTime="250.00" timeLoss="34.61" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="0.00" departLane="d_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="325.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="325.00" routeLength="550.03" waitingTime="2.00" waitingCount="1" stopTime="250.00" timeLoss="34.69" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t2" depart="0.00" departLane="-g_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="376.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="376.00" routeLength="1231.76" waitingTime="252.00" waitingCount="2" stopTime="1.00" timeLoss="300.34" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t3" depart="0.00" departLane="E1_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="491.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="491.00" routeLength="1150.14" waitingTime="340.00" waitingCount="2" stopTime="1.00" timeLoss="410.16" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="0.00" departLane="d_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="323.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="323.00" routeLength="550.03" waitingTime="0.00" waitingCount="0" stopTime="250.00" timeLoss="32.69" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="-d2_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="333.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="333.00" routeLength="691.03" waitingTime="0.00" waitingCount="0" stopTime="250.00" timeLoss="32.69" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="0.00" departLane="E1_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="387.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="387.00" routeLength="1150.24" waitingTime="247.00" waitingCount="2" stopTime="1.00" timeLoss="302.48" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="-g_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="407.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="407.00" routeLength="1232.18" waitingTime="255.00" waitingCount="2" stopTime="1.00" timeLoss="316.74" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>