patching expected results refs #21 (rerouting via rail signals is not…

… safe, refs #15597)
eclipse-sumo · Oct 15, 2024 · 92292ef · 92292ef
1 parent 187b28f
commit 92292ef
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 17 deletions.
diff --git a/tests/sumo/rail/bugs/ticket12873/errors.sumo b/tests/sumo/rail/bugs/ticket12873/errors.sumo
@@ -1,2 +1,8 @@
-Warning: Teleporting vehicle 'v_1'; frontal collision with vehicle 'v_0', lane='-E3.50_0', gap=-1.00, time=15.00 stage=move.
-Warning: Vehicle 'v_1' teleports beyond arrival edge '-E0', time=19.00.
+Warning: Invalid approach information to rail signal 'junction 'J7', link 0' after rerouting for vehicle 'v_1' first driveway edge '-E6' time=2.00.
+Warning: Vehicle 'v_1' performs emergency braking on lane '-E5_0' with decel=5.00, wished=1.30, severity=1.00, time=2.00.
+Warning: Vehicle 'v_1' performs emergency stop at the end of lane '-E5_0' because of a red traffic light (decel=-13.89, offset=7.88), time=2.00.
+Warning: Invalid approach information to rail signal 'junction 'J7', link 0' after rerouting for vehicle 'v_1' first driveway edge '-E6' time=18.00.
+Warning: Invalid approach information to rail signal 'junction 'J7', link 0' after rerouting for vehicle 'v_1' first driveway edge '-E6' time=20.00.
+Warning: Invalid approach information to rail signal 'junction 'J7', link 0' after rerouting for vehicle 'v_1' first driveway edge '-E6' time=22.00.
+Warning: Teleporting vehicle 'v_1'; frontal collision with vehicle 'v_0', lane='E3_0', gap=-1.00, time=42.00 stage=move.
+Warning: Vehicle 'v_1' ends teleporting on edge '-E0', time=42.00.
diff --git a/tests/sumo/rail/bugs/ticket12873/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket12873/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-15 15:27:20 by Eclipse SUMO sumo Version v1_20_0+0673-3703b293c4e
 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
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -62,7 +63,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":J5_1_0 E4_0 :J4_2_0 E30_0 :J9_1_0 E3_0 :J1_2_0 E0_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="J7_0"/>
-                <foes driveWays="J0.d0 J5.0.0 J5.1 J7.0 J9.0.0"/>
+                <foes driveWays="J0.d0 J1.d2 J5.0.0 J5.1 J7.0 J9.0.0"/>
             </driveWay>
             <subDriveWay id="J5.1.0" vehicle="" edges="-E4 -E3">
                 <forward lanes=":J5_0_0 -E4_0 :J4_1_0 -E3_0 :J9_0_0"/>
@@ -79,7 +80,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":J7_1_0 E6_0 :J1_3_0 E0_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals="J5_0"/>
-                <foes driveWays="J0.d0.0 J5.1 J7.0"/>
+                <foes driveWays="J0.d0.0 J1.d2 J5.1 J7.0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -97,6 +98,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             </subDriveWay>
         </link>
     </railSignal>
+    <departJunction id="J1">
+        <driveWay id="J1.d2" vehicle="v_1" edges="-E0">
+            <forward lanes="-E0_0"/>
+            <bidi lanes="E0_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals="J5_0 J7_0"/>
+            <foes driveWays="J0.d0.0 J1.d2 J5.1 J7.0"/>
+        </driveWay>
+    </departJunction>
     <departJunction id="J6">
         <driveWay id="J6.d1" vehicle="v_1" edges="-E5 -E4 -E8 -E7 -E6 -E0">
             <forward lanes="-E5_0"/>
@@ -114,7 +124,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                     deadlockCheck="-E4_0 :J5_0_0 -E5_0"/>
             <flank lanes=""/>
             <conflictLinks signals="J5_0 J7_0"/>
-            <foes driveWays="J0.d0 J5.1 J6.d1 J7.0"/>
+            <foes driveWays="J0.d0 J1.d2 J5.1 J6.d1 J7.0"/>
             <sidings foe="J6.d1">
                 <siding start="E3" end="E3" length="94.64"/>
             </sidings>

diff --git a/tests/sumo/rail/bugs/ticket12873/tripinfos.sumo b/tests/sumo/rail/bugs/ticket12873/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-22 08:30:37 by Eclipse SUMO sumo Version v1_16_0+1528-4fb4aca
+<!-- generated on 2024-10-15 15:27:20 by Eclipse SUMO sumo Version v1_20_0+0673-3703b293c4e
 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
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -44,6 +45,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="v_1" depart="0.00" departLane="-E5_0" departPos="35.10" departSpeed="13.89" departDelay="0.00" arrival="19.00" arrivalLane="-E0_0" arrivalPos="47.84" arrivalSpeed="13.89" duration="19.00" routeLength="257.59" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_v_1 routing_v_1" vType="t_0" speedFactor="1.00" vaporized="teleport"/>
-    <tripinfo id="v_0" depart="0.00" departLane="E0_0" departPos="35.10" departSpeed="0.00" departDelay="0.00" arrival="46.00" arrivalLane="E5_0" arrivalPos="50.00" arrivalSpeed="11.50" duration="46.00" routeLength="265.12" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="26.54" rerouteNo="0" devices="tripinfo_v_0" vType="t_0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v_1" depart="0.00" departLane="-E5_0" departPos="35.10" departSpeed="13.89" departDelay="0.00" arrival="43.00" arrivalLane="-E0_0" arrivalPos="47.84" arrivalSpeed="13.89" duration="43.00" routeLength="257.59" waitingTime="13.00" waitingCount="1" stopTime="0.00" timeLoss="33.05" rerouteNo="9" devices="tripinfo_v_1 routing_v_1" vType="t_0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v_0" depart="0.00" departLane="E0_0" departPos="35.10" departSpeed="0.00" departDelay="0.00" arrival="75.00" arrivalLane="E5_0" arrivalPos="50.00" arrivalSpeed="8.75" duration="75.00" routeLength="265.12" waitingTime="8.00" waitingCount="1" stopTime="0.00" timeLoss="55.46" rerouteNo="0" devices="tripinfo_v_0" vType="t_0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/two_passing_loops/errors.sumo b/tests/sumo/rail/two_passing_loops/errors.sumo
@@ -0,0 +1,2 @@
+Warning: Invalid approach information to rail signal 'junction 'w3', link 2' after rerouting for vehicle 'rail6' first driveway edge 'T4_0' time=430.00.
+Warning: Invalid approach information to rail signal 'junction 'w3', link 2' after rerouting for vehicle 'rail6' first driveway edge 'T4_0' time=440.00.
diff --git a/tests/sumo/rail/two_passing_loops/tripinfos.sumo b/tests/sumo/rail/two_passing_loops/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-14 23:08:02 by Eclipse SUMO sumo Version v1_20_0+0489-d33cee02165
+<!-- generated on 2024-10-15 15:27:20 by Eclipse SUMO sumo Version v1_20_0+0673-3703b293c4e
 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
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -43,9 +44,9 @@ 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="rail1" depart="10.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="131.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="44.44" duration="121.00" routeLength="4612.18" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="16.81" rerouteNo="2" devices="tripinfo_rail1 routing_rail1" vType="rail_rail" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="rail2" depart="20.00" departLane="T18_1_0" departPos="135.10" departSpeed="26.00" departDelay="0.00" arrival="253.00" arrivalLane="T7_1_0" arrivalPos="404.79" arrivalSpeed="40.25" duration="233.00" routeLength="4604.79" waitingTime="15.00" waitingCount="1" stopTime="0.00" timeLoss="128.91" rerouteNo="1" devices="tripinfo_rail2 routing_rail2" vType="rail_rail" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="rail3" depart="42.00" departLane="T7_0_0" departPos="135.10" departSpeed="25.83" departDelay="0.00" arrival="356.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="39.25" duration="314.00" routeLength="4564.90" waitingTime="71.00" waitingCount="1" stopTime="0.00" timeLoss="211.25" rerouteNo="2" devices="tripinfo_rail3 routing_rail3" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail1" depart="10.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="129.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="44.44" duration="119.00" routeLength="4612.18" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="14.43" rerouteNo="2" devices="tripinfo_rail1 routing_rail1" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail2" depart="20.00" departLane="T18_1_0" departPos="135.10" departSpeed="26.00" departDelay="0.00" arrival="251.00" arrivalLane="T7_1_0" arrivalPos="404.79" arrivalSpeed="40.25" duration="231.00" routeLength="4604.79" waitingTime="13.00" waitingCount="1" stopTime="0.00" timeLoss="126.91" rerouteNo="1" devices="tripinfo_rail2 routing_rail2" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail3" depart="42.00" departLane="T7_0_0" departPos="135.10" departSpeed="25.83" departDelay="0.00" arrival="354.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="39.25" duration="312.00" routeLength="4564.90" waitingTime="69.00" waitingCount="1" stopTime="0.00" timeLoss="209.25" rerouteNo="2" devices="tripinfo_rail3 routing_rail3" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail4" depart="300.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="404.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="44.44" duration="104.00" routeLength="4612.18" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="2" devices="tripinfo_rail4 routing_rail4" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail5" depart="350.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="453.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="44.44" duration="103.00" routeLength="4564.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_rail5 routing_rail5" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail6" depart="400.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="504.00" arrivalLane="T18_0_0" arrivalPos="408.12" arrivalSpeed="44.44" duration="104.00" routeLength="4612.18" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="6" devices="tripinfo_rail6 routing_rail6" vType="rail_rail" speedFactor="1.00" vaporized=""/>

diff --git a/tests/sumo/rail/two_passing_loops2/errors.sumo b/tests/sumo/rail/two_passing_loops2/errors.sumo
@@ -0,0 +1,3 @@
+Warning: Invalid approach information to rail signal 'junction 'w3', link 2' after rerouting for vehicle 'rail4' first driveway edge 'T4_0' time=350.00.
+Warning: Invalid approach information to rail signal 'junction 'w3', link 2' after rerouting for vehicle 'rail5' first driveway edge 'T4_0' time=390.00.
+Warning: Invalid approach information to rail signal 'junction 'w3', link 2' after rerouting for vehicle 'rail6' first driveway edge 'T4_0' time=440.00.
diff --git a/tests/sumo/rail/two_passing_loops2/tripinfos.sumo b/tests/sumo/rail/two_passing_loops2/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-14 23:08:02 by Eclipse SUMO sumo Version v1_20_0+0489-d33cee02165
+<!-- generated on 2024-10-15 15:27:20 by Eclipse SUMO sumo Version v1_20_0+0673-3703b293c4e
 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
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -43,9 +44,9 @@ 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="rail1" depart="10.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="131.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="44.44" duration="121.00" routeLength="4612.56" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="16.80" rerouteNo="2" devices="tripinfo_rail1 routing_rail1" vType="rail_rail" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="rail2" depart="20.00" departLane="T18_1_0" departPos="135.10" departSpeed="26.01" departDelay="0.00" arrival="253.00" arrivalLane="T7_1_0" arrivalPos="400.00" arrivalSpeed="40.25" duration="233.00" routeLength="4605.38" waitingTime="15.00" waitingCount="1" stopTime="0.00" timeLoss="128.90" rerouteNo="1" devices="tripinfo_rail2 routing_rail2" vType="rail_rail" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="rail3" depart="42.00" departLane="T7_0_0" departPos="135.10" departSpeed="25.84" departDelay="0.00" arrival="356.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="39.25" duration="314.00" routeLength="4565.50" waitingTime="71.00" waitingCount="1" stopTime="0.00" timeLoss="211.24" rerouteNo="2" devices="tripinfo_rail3 routing_rail3" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail1" depart="10.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="129.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="44.44" duration="119.00" routeLength="4612.56" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="14.43" rerouteNo="2" devices="tripinfo_rail1 routing_rail1" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail2" depart="20.00" departLane="T18_1_0" departPos="135.10" departSpeed="26.01" departDelay="0.00" arrival="251.00" arrivalLane="T7_1_0" arrivalPos="400.00" arrivalSpeed="40.25" duration="231.00" routeLength="4605.38" waitingTime="13.00" waitingCount="1" stopTime="0.00" timeLoss="126.90" rerouteNo="1" devices="tripinfo_rail2 routing_rail2" vType="rail_rail" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="rail3" depart="42.00" departLane="T7_0_0" departPos="135.10" departSpeed="25.84" departDelay="0.00" arrival="354.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="39.25" duration="312.00" routeLength="4565.50" waitingTime="69.00" waitingCount="1" stopTime="0.00" timeLoss="209.24" rerouteNo="2" devices="tripinfo_rail3 routing_rail3" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail4" depart="300.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="403.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="44.44" duration="103.00" routeLength="4565.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="3" devices="tripinfo_rail4 routing_rail4" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail5" depart="350.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="453.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="44.44" duration="103.00" routeLength="4565.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="3" devices="tripinfo_rail5 routing_rail5" vType="rail_rail" speedFactor="1.00" vaporized=""/>
     <tripinfo id="rail6" depart="400.00" departLane="T7_0_0" departPos="135.10" departSpeed="44.44" departDelay="0.00" arrival="503.00" arrivalLane="T18_0_0" arrivalPos="400.00" arrivalSpeed="44.44" duration="103.00" routeLength="4565.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="3" devices="tripinfo_rail6 routing_rail6" vType="rail_rail" speedFactor="1.00" vaporized=""/>