From d9049bde4d9d10a57b60adbcf2285508194e9fe2 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Mon, 9 Sep 2024 17:12:36 +0200
Subject: [PATCH] patching expected results refs #21, #7578

---
 .../bugs/ticket12184/railsignalblocks.sumo    |  4 ++--
 .../sumo/rail/bugs/ticket12184/tripinfos.sumo |  4 ++--
 .../bugs/ticket12184b/railsignalblocks.sumo   |  4 ++--
 .../rail/bugs/ticket12184b/tripinfos.sumo     |  4 ++--
 .../reversal/bidiDepart_reversal/errors.sumo  |  2 --
 .../bidiDepart_reversal/railsignalblocks.sumo | 11 ++++------
 .../bidiDepart_reversal/railsignalvehs.sumo   | 20 +++++++------------
 .../bidiDepart_reversal/tripinfos.sumo        |  4 ++--
 .../railsignalblocks.sumo                     | 11 ++++------
 .../railsignalblocks.sumo                     | 11 ++++------
 10 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/tests/sumo/rail/bugs/ticket12184/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket12184/railsignalblocks.sumo
index 2aa73a8919cb..13d13e6f53b0 100644
--- a/tests/sumo/rail/bugs/ticket12184/railsignalblocks.sumo
+++ b/tests/sumo/rail/bugs/ticket12184/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-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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
@@ -72,7 +72,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=":J1_1_0 E0_0"/>
             <protectingSwitches links=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d0 J2.0 J5.d1"/>
+            <foes driveWays="J2.0 J5.d1"/>
         </driveWay>
     </departJunction>
     <departJunction id="J0">
diff --git a/tests/sumo/rail/bugs/ticket12184/tripinfos.sumo b/tests/sumo/rail/bugs/ticket12184/tripinfos.sumo
index 258b73eefba7..362a11c00f5d 100644
--- a/tests/sumo/rail/bugs/ticket12184/tripinfos.sumo
+++ b/tests/sumo/rail/bugs/ticket12184/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-05 13:57:21 by Eclipse SUMO sumo Version v1_20_0+0455-eda2cef667b
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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,5 +39,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="v0" depart="0.00" departLane="E0_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="67.00" arrivalLane="E2_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="67.00" routeLength="550.10" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="27.28" rerouteNo="0" devices="tripinfo_v0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="v1" depart="67.00" departLane="-E4_0" departPos="50.10" departSpeed="0.00" departDelay="67.00" arrival="149.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="82.00" routeLength="750.20" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="27.28" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v1" depart="0.00" departLane="-E4_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="124.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="124.00" routeLength="750.20" waitingTime="10.00" waitingCount="1" stopTime="0.00" timeLoss="69.16" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/bugs/ticket12184b/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket12184b/railsignalblocks.sumo
index 33948ba4e7cb..d73d221bc929 100644
--- a/tests/sumo/rail/bugs/ticket12184b/railsignalblocks.sumo
+++ b/tests/sumo/rail/bugs/ticket12184b/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-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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
@@ -80,7 +80,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=":J1_1_0 E0_0"/>
             <protectingSwitches links=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d0 J2.0 J5.d1"/>
+            <foes driveWays="J2.0 J5.d1"/>
         </driveWay>
     </departJunction>
     <departJunction id="J0">
diff --git a/tests/sumo/rail/bugs/ticket12184b/tripinfos.sumo b/tests/sumo/rail/bugs/ticket12184b/tripinfos.sumo
index 258b73eefba7..362a11c00f5d 100644
--- a/tests/sumo/rail/bugs/ticket12184b/tripinfos.sumo
+++ b/tests/sumo/rail/bugs/ticket12184b/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-05 13:57:21 by Eclipse SUMO sumo Version v1_20_0+0455-eda2cef667b
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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,5 +39,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="v0" depart="0.00" departLane="E0_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="67.00" arrivalLane="E2_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="67.00" routeLength="550.10" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="27.28" rerouteNo="0" devices="tripinfo_v0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="v1" depart="67.00" departLane="-E4_0" departPos="50.10" departSpeed="0.00" departDelay="67.00" arrival="149.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="82.00" routeLength="750.20" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="27.28" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v1" depart="0.00" departLane="-E4_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="124.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="124.00" routeLength="750.20" waitingTime="10.00" waitingCount="1" stopTime="0.00" timeLoss="69.16" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/errors.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/errors.sumo
index 8dd3b6b460d4..e69de29bb2d1 100644
--- a/tests/sumo/rail/reversal/bidiDepart_reversal/errors.sumo
+++ b/tests/sumo/rail/reversal/bidiDepart_reversal/errors.sumo
@@ -1,2 +0,0 @@
-Warning: Vehicle 'v1' performs emergency braking on lane 'E0_0' with decel=5.00, wished=1.30, severity=1.00, time=111.00.
-Warning: Vehicle 'v1' performs emergency stop at the end of lane 'E0_0' because of a red traffic light (decel=-8.89, offset=1.78), time=112.00.
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalblocks.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalblocks.sumo
index bd15cbbd9d8c..38a425ce605c 100644
--- 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-09 16:41:55 by Eclipse SUMO sumo Version v1_20_0+0546-43bbc0052c4
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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,7 +49,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <flank lanes=""/>
                 <protectingSwitches links=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="J1.0 J4.d0.0"/>
+                <foes driveWays="J1.0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -83,12 +83,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="E3_0 -E3_0"/>
             <flank lanes=":J3_2_0"/>
             <protectingSwitches links=""/>
-            <conflictLinks signals="J1_0 J3_0"/>
+            <conflictLinks signals="J3_0"/>
             <foes driveWays="J3.0 J3.d2 J4.d0"/>
         </driveWay>
-        <subDriveWay id="J4.d0.0" vehicle="" edges="-E3">
-            <forward lanes="-E3_0"/>
-        </subDriveWay>
     </departJunction>
     <departJunction id="J0">
         <driveWay id="J0.d1" vehicle="v1" edges="E0 E1 E2 E3">
@@ -97,7 +94,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=""/>
             <protectingSwitches links=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d1 J4.d0.0"/>
+            <foes driveWays="J0.d1"/>
         </driveWay>
     </departJunction>
     <departJunction id="J3">
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
index b47158ee032f..4dd242241569 100644
--- a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
@@ -1,16 +1,16 @@
 <railSignal id="J1">
     <link linkIndex="0" from="E0_0" to=":J1_1_0">
         <driveWay id="J1.0">
-            <entry id="v1" time="147.00" reason="1"/>
-            <exit id="v1" time="191.00" reason="1"/>
+            <entry id="v1" time="111.00" reason="1"/>
+            <exit id="v1" time="159.00" reason="1"/>
         </driveWay>
     </link>
 </railSignal>
 <railSignal id="J3">
     <link linkIndex="0" from="E2_0" to=":J3_2_0">
         <driveWay id="J3.0">
-            <entry id="v1" time="186.00" reason="1"/>
-            <exit id="v1" time="199.00" reason="1"/>
+            <entry id="v1" time="142.00" reason="1"/>
+            <exit id="v1" time="174.00" reason="1"/>
         </driveWay>
     </link>
 </railSignal>
@@ -21,8 +21,8 @@
             <exit id="v0" time="45.00" reason="9"/>
             <entry id="v2" time="131.00" reason="1"/>
             <exit id="v2" time="146.00" reason="9"/>
-            <entry id="v1" time="195.00" reason="1"/>
-            <exit id="v1" time="203.00" reason="9"/>
+            <entry id="v1" time="167.00" reason="1"/>
+            <exit id="v1" time="179.00" reason="9"/>
         </driveWay>
     </link>
 </railSignal>
@@ -33,17 +33,11 @@
         <entry id="v2" time="110.00" reason="1"/>
         <exit id="v2" time="139.00" reason="1"/>
     </driveWay>
-    <subDriveWay id="J4.d0.0">
-        <entry id="v0" time="0.00" reason="0"/>
-        <exit id="v0" time="45.00" reason="9"/>
-        <entry id="v2" time="110.00" reason="1"/>
-        <exit id="v2" time="146.00" reason="9"/>
-    </subDriveWay>
 </departJunction>
 <departJunction id="J0">
     <driveWay id="J0.d1">
         <entry id="v1" time="100.00" reason="0"/>
-        <exit id="v1" time="166.00" reason="1"/>
+        <exit id="v1" time="115.00" reason="1"/>
     </driveWay>
 </departJunction>
 <departJunction id="J3">
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/tripinfos.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/tripinfos.sumo
index 1026197e841b..0ed030d0b752 100644
--- a/tests/sumo/rail/reversal/bidiDepart_reversal/tripinfos.sumo
+++ b/tests/sumo/rail/reversal/bidiDepart_reversal/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-09 16:41:55 by Eclipse SUMO sumo Version v1_20_0+0546-43bbc0052c4
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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
@@ -43,5 +43,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="v0" depart="0.00" departLane="-E3_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="45.00" arrivalLane="E4_0" arrivalPos="98.50" arrivalSpeed="8.75" duration="45.00" routeLength="248.50" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="30.18" rerouteNo="0" devices="tripinfo_v0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="v2" depart="109.00" departLane="E3_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="146.00" arrivalLane="E4_0" arrivalPos="98.50" arrivalSpeed="8.75" duration="37.00" routeLength="347.10" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="25.66" rerouteNo="0" devices="tripinfo_v2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="v1" depart="100.00" departLane="E0_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="203.00" arrivalLane="E4_0" arrivalPos="98.50" arrivalSpeed="13.89" duration="103.00" routeLength="550.20" waitingTime="35.00" waitingCount="1" stopTime="0.00" timeLoss="62.36" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v1" depart="100.00" departLane="E0_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="179.00" arrivalLane="E4_0" arrivalPos="98.50" arrivalSpeed="10.00" duration="79.00" routeLength="550.20" waitingTime="9.00" waitingCount="1" stopTime="0.00" timeLoss="39.11" rerouteNo="0" devices="tripinfo_v1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/reversal/reversal_in_first_block/railsignalblocks.sumo b/tests/sumo/rail/reversal/reversal_in_first_block/railsignalblocks.sumo
index 441902451714..e12570b8100b 100644
--- a/tests/sumo/rail/reversal/reversal_in_first_block/railsignalblocks.sumo
+++ b/tests/sumo/rail/reversal/reversal_in_first_block/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-06 11:21:43 by Eclipse SUMO sumo Version v1_20_0+0534-0a923286778
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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,7 +47,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <flank lanes=""/>
                 <protectingSwitches links=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="J2.0 J4.d0.0"/>
+                <foes driveWays="J2.0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -82,12 +82,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="E3_0 -E3_0 :J4_0_0 -E4_0"/>
             <flank lanes=":J3_2_0 :J4_0_0 -E4_0"/>
             <protectingSwitches links=""/>
-            <conflictLinks signals="J2_1 J3_1"/>
+            <conflictLinks signals="J3_1"/>
             <foes driveWays="J3.0 J4.d0"/>
         </driveWay>
-        <subDriveWay id="J4.d0.0" vehicle="" edges="-E3">
-            <forward lanes="-E3_0"/>
-        </subDriveWay>
     </departJunction>
     <departJunction id="J0">
         <driveWay id="J0.d1" vehicle="v_1" edges="E0 E1 E2 E3 E4">
@@ -96,7 +93,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=""/>
             <protectingSwitches links=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d1 J4.d0.0"/>
+            <foes driveWays="J0.d1"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>
diff --git a/tests/sumo/rail/reversal/reversal_in_first_block2/railsignalblocks.sumo b/tests/sumo/rail/reversal/reversal_in_first_block2/railsignalblocks.sumo
index abb21d001136..bae25a8a73c5 100644
--- a/tests/sumo/rail/reversal/reversal_in_first_block2/railsignalblocks.sumo
+++ b/tests/sumo/rail/reversal/reversal_in_first_block2/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-06 11:32:48 by Eclipse SUMO sumo Version v1_20_0+0536-d0c31613203
+<!-- generated on 2024-09-09 16:45:45 by Eclipse SUMO sumo Version v1_20_0+0547-8643e0c2683
 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,7 +47,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <flank lanes=""/>
                 <protectingSwitches links=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="J2.0 J4.d0.0"/>
+                <foes driveWays="J2.0"/>
             </driveWay>
         </link>
     </railSignal>
@@ -83,12 +83,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <bidi lanes="E3_0 -E3_0 :J4_0_0 -E4_0 :J5_0_0 -E5_0"/>
             <flank lanes=":J3_2_0 :J4_0_0 -E4_0 :J5_0_0"/>
             <protectingSwitches links=""/>
-            <conflictLinks signals="J2_1 J3_1 J5_0"/>
+            <conflictLinks signals="J3_1 J5_0"/>
             <foes driveWays="J3.0 J4.d0"/>
         </driveWay>
-        <subDriveWay id="J4.d0.0" vehicle="" edges="-E3">
-            <forward lanes="-E3_0"/>
-        </subDriveWay>
     </departJunction>
     <departJunction id="J0">
         <driveWay id="J0.d1" vehicle="v_1" edges="E0 E1 E2 E3 E4 E5">
@@ -97,7 +94,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <flank lanes=""/>
             <protectingSwitches links=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d1 J4.d0.0"/>
+            <foes driveWays="J0.d1"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>