From 44964b5e4140d9c11ff6a3dd9ebfc382503737db Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:05:46 +0200
Subject: [PATCH 1/7] avoid match with too short driveWay. refs #7578

---
 src/microsim/traffic_lights/MSDriveWay.cpp | 7 ++++++-
 src/microsim/traffic_lights/MSDriveWay.h   | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
index c432bfa7a35..a5582a23548 100644
--- a/src/microsim/traffic_lights/MSDriveWay.cpp
+++ b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -102,6 +102,8 @@ MSDriveWay::MSDriveWay(const MSLink* origin, const std::string& id, bool tempora
         myFoundSignal(false),
         myFoundJump(false),
         myTerminateRoute(false),
+        myAbortedBuild(false),
+        myBidiEnded(false),
         myIsSubDriveway(false)
 {}
 
@@ -845,6 +847,7 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
                               " exceeds maximum length (stopped searching after edge '" + toLane->getEdge().getID() + "' (length=" + toString(length) + "m).");
             }
             myNumWarnings++;
+            myAbortedBuild = true;
             // length exceeded
             return;
         }
@@ -934,6 +937,7 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
                     if (link == origin) {
                         WRITE_WARNINGF(TL("Found circular block after % (% edges, length %)"), warnID, toString(myRoute.size()), toString(length));
                         //std::cout << getClickableTLLinkID(origin) << " circularBlock2=" << toString(myRoute) << "\n";
+                        myAbortedBuild = true;
                         return;
                     }
                     seekForwardSignal = false;
@@ -981,6 +985,7 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
             }
         }
     }
+    myBidiEnded = !seekBidiSwitch;
 }
 
 
@@ -1379,7 +1384,7 @@ MSDriveWay::match(MSRouteIterator firstIt, MSRouteIterator endIt) const {
     // if the vehicle arrives before the end of this driveway,
     // we'd rather build a new driveway to avoid superfluous restrictions
     if (match && itDwRoute == myRoute.end()
-            && (itRoute == endIt || myFoundSignal || myFoundJump || myIsSubDriveway)) {
+            && (itRoute == endIt || myAbortedBuild || myBidiEnded || myFoundJump || myIsSubDriveway)) {
         //std::cout << "  using dw=" << "\n";
         if (itRoute != endIt) {
             // check whether the current route requires an extended driveway
diff --git a/src/microsim/traffic_lights/MSDriveWay.h b/src/microsim/traffic_lights/MSDriveWay.h
index 595996df198..40c079fcedb 100644
--- a/src/microsim/traffic_lights/MSDriveWay.h
+++ b/src/microsim/traffic_lights/MSDriveWay.h
@@ -204,6 +204,10 @@ class MSDriveWay : public MSMoveReminder, public Named {
     bool myFoundSignal;
     bool myFoundJump;
     bool myTerminateRoute;
+    /// @brief whether driveway building was aborted due to MAX_BLOCK_LENGTH
+    bool myAbortedBuild;
+    /// @brief whether driveway building was aborted when no further bidi edge was found
+    bool myBidiEnded;
     bool myIsSubDriveway;
 
     /* @brief the actual driveway part up to the next railsignal (halting position)

From 221e8f1b6a18a1689a0443adf8a696da174802d6 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:05:50 +0200
Subject: [PATCH 2/7] patching expected results refs #21, #7578

---
 .../railsignalblocks.sumo                     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/sumo/rail/rail_signal/driveWayShort_badMatch/railsignalblocks.sumo b/tests/sumo/rail/rail_signal/driveWayShort_badMatch/railsignalblocks.sumo
index 3044d0d185e..d4147cfcd0b 100644
--- a/tests/sumo/rail/rail_signal/driveWayShort_badMatch/railsignalblocks.sumo
+++ b/tests/sumo/rail/rail_signal/driveWayShort_badMatch/railsignalblocks.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-10-17 08:49:32 by Eclipse SUMO sumo Version v1_20_0+0698-aca94090b54
 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,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=":J1_0_0 -E1_0 :J2_0_0 -E2_0"/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="J1.0"/>
+                <foes driveWays="J1.0 J1.1"/>
+            </driveWay>
+            <driveWay id="J1.1" vehicle="t_1" edges="E1 E2 E3 E4">
+                <forward lanes=":J1_1_0 E1_0"/>
+                <bidi lanes=":J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="J1.0 J1.1"/>
             </driveWay>
         </link>
     </railSignal>
@@ -87,7 +94,14 @@ 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"/>
             <flank lanes=""/>
             <conflictLinks signals=""/>
-            <foes driveWays="J0.d0"/>
+            <foes driveWays="J0.d0 J0.d1"/>
+        </driveWay>
+        <driveWay id="J0.d1" vehicle="t_1" edges="E0 E1 E2 E3 E4">
+            <forward lanes="E0_0"/>
+            <bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals=""/>
+            <foes driveWays="J0.d0 J0.d1"/>
         </driveWay>
     </departJunction>
 </railsignal-block-output>

From 72bcfbb1c52c7fd62143be009d39b47cc684eeac Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:08:26 +0200
Subject: [PATCH 3/7] fixing debug code

---
 src/microsim/traffic_lights/MSDriveWay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
index a5582a23548..13173dbfff9 100644
--- a/src/microsim/traffic_lights/MSDriveWay.cpp
+++ b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -1727,7 +1727,7 @@ MSDriveWay::addSidings(MSDriveWay* foe, bool addToFoe) {
             auto itFind = std::find(foeSearchBeg, foeSearchEnd, cur->getBidiEdge());
             if (itFind != foeSearchEnd) {
 #ifdef DEBUG_BUILD_SIDINGS
-                std::cout << "endSiding " << getID() << " foe=" << foe->getID() << " i=" << i << " curBidi=" << Named::getIDSecure(cur->getBidiEdge()) << " length=" << length << "\n";
+                std::cout << "endSiding " << getID() << " foe=" << foe->getID() << " i=" << i << " curBidi=" << Named::getIDSecure(cur->getBidiEdge()) << " length=" << toString(length) << "\n";
 #endif
                 const int firstIndex = i + 1;
                 if (addToFoe) {

From 455622f222d56ccb3369127bff57862efb5cfab4 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:15:22 +0200
Subject: [PATCH 4/7] notice on test results refs #21, #7578

---
 tests/sumo/rail/rail_signal/testsuite.sumo | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/sumo/rail/rail_signal/testsuite.sumo b/tests/sumo/rail/rail_signal/testsuite.sumo
index 4d99c5bf81b..9c9011eb2ef 100644
--- a/tests/sumo/rail/rail_signal/testsuite.sumo
+++ b/tests/sumo/rail/rail_signal/testsuite.sumo
@@ -132,5 +132,7 @@ driveway_variants
 # corner case that caused a crash
 subDriveWay_short
 
-# corner case that causes a deadlock between 2 vehicles due to invalid driveway matching
+# corner case that causes a deadlock between 2 vehicles due to invalid driveway matching.
+# 
+# Even after corrected matching, there is still a deadlock because train t4 which enters last never passes a switch or signal and therefore doesnt "see" any conflicts.
 driveWayShort_badMatch

From 550959f676af64f95b9873d075c632aed71a8fee Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:32:24 +0200
Subject: [PATCH 5/7] tweaking debug code

---
 src/microsim/traffic_lights/MSDriveWay.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
index 13173dbfff9..9b00aeb4ebf 100644
--- a/src/microsim/traffic_lights/MSDriveWay.cpp
+++ b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -45,9 +45,6 @@
 //#define SUBDRIVEWAY_WARN_NOCONFLICT
 
 //#define DEBUG_BUILD_DRIVEWAY
-//#define DEBUG_BUILD_SUBDRIVEWAY
-//#define DEBUG_ADD_FOES
-//#define DEBUG_BUILD_SIDINGS
 //#define DEBUG_DRIVEWAY_BUILDROUTE
 //#define DEBUG_CHECK_FLANKS
 //#define DEBUG_SIGNALSTATE_PRIORITY
@@ -849,6 +846,9 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
             myNumWarnings++;
             myAbortedBuild = true;
             // length exceeded
+#ifdef DEBUG_DRIVEWAY_BUILDROUTE
+            if (gDebugFlag4) std::cout << " abort: length=" << length << "\n";
+#endif
             return;
         }
 #ifdef DEBUG_DRIVEWAY_BUILDROUTE
@@ -938,6 +938,9 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
                         WRITE_WARNINGF(TL("Found circular block after % (% edges, length %)"), warnID, toString(myRoute.size()), toString(length));
                         //std::cout << getClickableTLLinkID(origin) << " circularBlock2=" << toString(myRoute) << "\n";
                         myAbortedBuild = true;
+#ifdef DEBUG_DRIVEWAY_BUILDROUTE
+                        if (gDebugFlag4) std::cout << " abort: found circle\n";
+#endif
                         return;
                     }
                     seekForwardSignal = false;
@@ -986,6 +989,9 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
         }
     }
     myBidiEnded = !seekBidiSwitch;
+#ifdef DEBUG_DRIVEWAY_BUILDROUTE
+    if (gDebugFlag4) std::cout << " normalEnd myBidiEnded=" << myBidiEnded << "\n";
+#endif
 }
 
 

From b5901620f73c3de4785ecb2806269aac3a9f32c7 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:44:39 +0200
Subject: [PATCH 6/7] saving empty driveWay to state if a subDriveWay has
 vehicles (for lookup during loading). refs #7578

---
 data/xsd/state_file.xsd                    |  2 +-
 src/microsim/traffic_lights/MSDriveWay.cpp | 23 +++++++++++++++++++---
 src/microsim/traffic_lights/MSDriveWay.h   |  2 ++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/data/xsd/state_file.xsd b/data/xsd/state_file.xsd
index 16bc3005b57..6d8b359fe24 100644
--- a/data/xsd/state_file.xsd
+++ b/data/xsd/state_file.xsd
@@ -238,7 +238,7 @@
     <xsd:complexType name="driveWayStateType">
         <xsd:attribute name="id" type="idType" use="required"/>
         <xsd:attribute name="edges" type="xsd:string" use="required"/>
-        <xsd:attribute name="vehicles" type="xsd:string" use="required"/>
+        <xsd:attribute name="vehicles" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
 </xsd:schema>
diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
index 9b00aeb4ebf..726beb33b5a 100644
--- a/src/microsim/traffic_lights/MSDriveWay.cpp
+++ b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -1887,15 +1887,28 @@ MSDriveWay::saveState(OutputDevice& out) {
 
 void
 MSDriveWay::_saveState(OutputDevice& out) const {
-    if (!myTrains.empty()) {
+    if (!myTrains.empty() || haveSubTrains()) {
         out.openTag(myIsSubDriveway ? SUMO_TAG_SUBDRIVEWAY : SUMO_TAG_DRIVEWAY);
         out.writeAttr(SUMO_ATTR_ID, getID());
         out.writeAttr(SUMO_ATTR_EDGES, toString(myRoute));
-        out.writeAttr(SUMO_ATTR_VEHICLES, toString(myTrains));
+        if (!myTrains.empty()) {
+            out.writeAttr(SUMO_ATTR_VEHICLES, toString(myTrains));
+        }
         out.closeTag();
     }
 }
 
+
+bool
+MSDriveWay::haveSubTrains() const {
+    for (MSDriveWay* sub : mySubDriveWays) {
+        if (!sub->myTrains.empty()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 void
 MSDriveWay::loadState(const SUMOSAXAttributes& attrs, int tag) {
     if ((int)myDriveWayRouteLookup.size() < myGlobalDriveWayIndex) {
@@ -1917,6 +1930,8 @@ MSDriveWay::loadState(const SUMOSAXAttributes& attrs, int tag) {
     if (tag == SUMO_TAG_DRIVEWAY) {
         auto it = myDriveWayRouteLookup.find(route);
         if (it == myDriveWayRouteLookup.end()) {
+            //WRITE_WARNING(TLF("Unknown driveWay '%' with route '%'", id, edges));
+            //return;
             throw ProcessError(TLF("Unknown driveWay '%' with route '%'", id, edges));
         }
         dw = it->second;
@@ -1925,6 +1940,8 @@ MSDriveWay::loadState(const SUMOSAXAttributes& attrs, int tag) {
         std::string parentID = id.substr(0, id.rfind('.'));
         auto it = myDriveWayLookup.find(parentID);
         if (it == myDriveWayLookup.end()) {
+            //WRITE_WARNING(TLF("Unknown parent driveway '%' for subDriveWay '%'", parentID, id));
+            //return;
             throw ProcessError(TLF("Unknown parent driveway '%' for subDriveWay '%'", parentID, id));
         }
         MSDriveWay* parent = it->second;
@@ -1940,7 +1957,7 @@ MSDriveWay::loadState(const SUMOSAXAttributes& attrs, int tag) {
             return;
         }
     }
-    const std::string vehicles = attrs.get<std::string>(SUMO_ATTR_VEHICLES, id.c_str(), ok);
+    const std::string vehicles = attrs.getOpt<std::string>(SUMO_ATTR_VEHICLES, id.c_str(), ok, "");
     for (const std::string& vehID : StringTokenizer(vehicles).getVector()) {
         MSBaseVehicle* veh = dynamic_cast<MSBaseVehicle*>(c.getVehicle(vehID));
         if (veh == nullptr) {
diff --git a/src/microsim/traffic_lights/MSDriveWay.h b/src/microsim/traffic_lights/MSDriveWay.h
index 40c079fcedb..b8fe937e239 100644
--- a/src/microsim/traffic_lights/MSDriveWay.h
+++ b/src/microsim/traffic_lights/MSDriveWay.h
@@ -300,6 +300,8 @@ class MSDriveWay : public MSMoveReminder, public Named {
 
     void addSwitchFoes(MSLink* link);
 
+    bool haveSubTrains() const;
+
     static bool hasJoin(const SUMOVehicle* ego, const SUMOVehicle* foe);
 
     static bool isSwitch(const MSLink* link);

From 52255a2802fed53c20a6de971efcc2304c791bb3 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Thu, 17 Oct 2024 09:44:45 +0200
Subject: [PATCH 7/7] patching expected results refs #21, #7578

---
 .../state/rail/save_on_rail_signal/state.complex   |  6 +++---
 .../state/rail/save_rail_signal2/output.complex    |  8 ++++----
 .../save_rail_signal2/railsignalblocks.complex     |  6 +++---
 .../save_rail_signal2/railsignalblocks2.complex    |  6 +++---
 .../rail/save_rail_signal2/railsignalvehs.complex  |  4 ++--
 .../rail/save_rail_signal2/railsignalvehs2.complex |  4 ++--
 .../state/rail/save_rail_signal2/state.complex     |  6 +++---
 .../save_rail_signal_constraint/output.complex     | 14 +++++++-------
 .../rail/save_rail_signal_constraint/state.complex |  6 +++---
 .../save_rail_signal_constraint/state2.complex     |  6 +++---
 .../output.complex                                 | 12 ++++++------
 .../state.complex                                  |  6 +++---
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/tests/complex/state/rail/save_on_rail_signal/state.complex b/tests/complex/state/rail/save_on_rail_signal/state.complex
index 1efa8984598..9644970a2e8 100644
--- a/tests/complex/state/rail/save_on_rail_signal/state.complex
+++ b/tests/complex/state/rail/save_on_rail_signal/state.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 10:53:55 by Eclipse SUMO sumo Version v1_20_0+0689-312159a3031
+<!-- generated on 2024-10-17 09:42:57 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -26,7 +26,7 @@
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0689-312159a3031" time="116.00" type="micro" rail="1">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0703-550959f676a" time="116.00" type="micro" rail="1">
     <route id="!train2" state="0" edges="-e -b -d"/>
     <route id="!train3" state="0" edges="-e -b -d"/>
     <delay number="1" begin="3" end="1" depart="31.00" time="31.00"/>
@@ -56,5 +56,5 @@
             <approaching id="train2" arrivalTime="146000" arrivalSpeed="2.00" departSpeed="5.72" request="1" arrivalSpeedBraking="0.00" waitingTime="0" distance="0.00"/>
         </link>
     </lane>
-    <driveWay id="gneJ7.d1" edges="-e -b -d" vehicles="train2"/>
+    <driveWay id="gneJ7.d0" edges="-e -b -d" vehicles="train2"/>
 </snapshot>
diff --git a/tests/complex/state/rail/save_rail_signal2/output.complex b/tests/complex/state/rail/save_rail_signal2/output.complex
index 50aef873001..e445ffad9a9 100644
--- a/tests/complex/state/rail/save_rail_signal2/output.complex
+++ b/tests/complex/state/rail/save_rail_signal2/output.complex
@@ -1,12 +1,12 @@
 Loading net-file from 'net.net.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0687-ce2c48e1a87 started with time: 0.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 0.00.
 Simulation ended at time: 54.00
 Reason: All vehicles have left the simulation.
 Loading net-file from 'net.net.xml' ... done (0ms).
 Loading state from 'state.xml' ... done (6ms).
 Loading done.
-Simulation version v1_20_0+0687-ce2c48e1a87 started with time: 20.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 20.00.
 Simulation ended at time: 54.00
 Reason: All vehicles have left the simulation.
 <                 <entry id="train" time="9.00" reason="1"/>
@@ -50,10 +50,10 @@ Reason: All vehicles have left the simulation.
 <         </link>
 >     <departJunction id="gneJ7">
 <     </railSignal>
->         <driveWay id="gneJ7.d1">
+>         <driveWay id="gneJ7.d0">
 <     <departJunction id="gneJ7">
 >             <exit id="train2" time="30.00" reason="1"/>
-<         <driveWay id="gneJ7.d1">
+<         <driveWay id="gneJ7.d0">
 >         </driveWay>
 <             <entry id="train2" time="1.00" reason="0"/>
 >     </departJunction>
diff --git a/tests/complex/state/rail/save_rail_signal2/railsignalblocks.complex b/tests/complex/state/rail/save_rail_signal2/railsignalblocks.complex
index c928f8a12af..6d8043f53ac 100644
--- a/tests/complex/state/rail/save_rail_signal2/railsignalblocks.complex
+++ b/tests/complex/state/rail/save_rail_signal2/railsignalblocks.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:04:06 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-10-17 09:42:57 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -58,13 +58,13 @@
         </link>
     </railSignal>
     <departJunction id="gneJ7">
-        <driveWay id="gneJ7.d1" vehicle="train2" edges="-d2 -c -b -a2">
+        <driveWay id="gneJ7.d0" vehicle="train2" edges="-d2 -c -b -a2">
             <forward lanes="-d2_0"/>
             <bidi lanes="d2_0 :B_3_0"
                     deadlockCheck="c_0 :J0_1_0 b_0 :A_3_0 a2_0"/>
             <flank lanes=""/>
             <conflictLinks signals="A_0"/>
-            <foes driveWays="A.0.0 gneJ7.d1"/>
+            <foes driveWays="A.0.0 gneJ7.d0"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ0">
diff --git a/tests/complex/state/rail/save_rail_signal2/railsignalblocks2.complex b/tests/complex/state/rail/save_rail_signal2/railsignalblocks2.complex
index 3f1bc633c02..3268fdab4fc 100644
--- a/tests/complex/state/rail/save_rail_signal2/railsignalblocks2.complex
+++ b/tests/complex/state/rail/save_rail_signal2/railsignalblocks2.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:04:07 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-10-17 09:42:58 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -57,13 +57,13 @@
         </link>
     </railSignal>
     <departJunction id="gneJ7">
-        <driveWay id="gneJ7.d1" vehicle="train2" edges="-d2 -c -b -a2">
+        <driveWay id="gneJ7.d0" vehicle="train2" edges="-d2 -c -b -a2">
             <forward lanes="-d2_0"/>
             <bidi lanes="d2_0 :B_3_0"
                     deadlockCheck="c_0 :J0_1_0 b_0 :A_3_0 a2_0"/>
             <flank lanes=""/>
             <conflictLinks signals="A_0"/>
-            <foes driveWays="A.0.0 gneJ7.d1"/>
+            <foes driveWays="A.0.0 gneJ7.d0"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ0">
diff --git a/tests/complex/state/rail/save_rail_signal2/railsignalvehs.complex b/tests/complex/state/rail/save_rail_signal2/railsignalvehs.complex
index 7db1aabd213..701a13571d1 100644
--- a/tests/complex/state/rail/save_rail_signal2/railsignalvehs.complex
+++ b/tests/complex/state/rail/save_rail_signal2/railsignalvehs.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:04:06 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-10-17 09:42:57 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -54,7 +54,7 @@
         </link>
     </railSignal>
     <departJunction id="gneJ7">
-        <driveWay id="gneJ7.d1">
+        <driveWay id="gneJ7.d0">
             <entry id="train2" time="1.00" reason="0"/>
             <exit id="train2" time="30.00" reason="1"/>
         </driveWay>
diff --git a/tests/complex/state/rail/save_rail_signal2/railsignalvehs2.complex b/tests/complex/state/rail/save_rail_signal2/railsignalvehs2.complex
index a295d7b8568..5929bd315fa 100644
--- a/tests/complex/state/rail/save_rail_signal2/railsignalvehs2.complex
+++ b/tests/complex/state/rail/save_rail_signal2/railsignalvehs2.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 10:04:20 by Eclipse SUMO sumo Version v1_20_0+0687-ce2c48e1a87
+<!-- generated on 2024-10-17 09:42:58 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -51,7 +51,7 @@
         </link>
     </railSignal>
     <departJunction id="gneJ7">
-        <driveWay id="gneJ7.d1">
+        <driveWay id="gneJ7.d0">
             <exit id="train2" time="30.00" reason="1"/>
         </driveWay>
     </departJunction>
diff --git a/tests/complex/state/rail/save_rail_signal2/state.complex b/tests/complex/state/rail/save_rail_signal2/state.complex
index 0721bb1e896..c88aedf9765 100644
--- a/tests/complex/state/rail/save_rail_signal2/state.complex
+++ b/tests/complex/state/rail/save_rail_signal2/state.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 10:53:55 by Eclipse SUMO sumo Version v1_20_0+0689-312159a3031
+<!-- generated on 2024-10-17 09:42:57 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -28,7 +28,7 @@
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0689-312159a3031" time="20.00" type="micro" rail="1">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0703-550959f676a" time="20.00" type="micro" rail="1">
     <route id="!train" state="0" edges="a b c d"/>
     <route id="!train2" state="0" edges="-d2 -c -b -a2"/>
     <delay number="2" begin="2" end="0" depart="0.00" time="0.00"/>
@@ -54,5 +54,5 @@
     </lane>
     <driveWay id="A.0" edges="b c d" vehicles="train"/>
     <subDriveWay id="A.0.0" edges="b c" vehicles="train"/>
-    <driveWay id="gneJ7.d1" edges="-d2 -c -b -a2" vehicles="train2"/>
+    <driveWay id="gneJ7.d0" edges="-d2 -c -b -a2" vehicles="train2"/>
 </snapshot>
diff --git a/tests/complex/state/rail/save_rail_signal_constraint/output.complex b/tests/complex/state/rail/save_rail_signal_constraint/output.complex
index 9b7e8e319b4..8fb76b69aa0 100644
--- a/tests/complex/state/rail/save_rail_signal_constraint/output.complex
+++ b/tests/complex/state/rail/save_rail_signal_constraint/output.complex
@@ -1,18 +1,18 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (0ms).
 Loading additional-files from 'input_additional.add.xml' ... done (5ms).
 Loading additional-files from 'input_additional2.add.xml' ... done (5ms).
 Loading done.
-Simulation version v1_20_0+0691-822de6bf232 started with time: 0.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 0.00.
 Simulation ended at time: 269.00
 Reason: All vehicles have left the simulation.
-DijkstraRouter answered 6 queries and explored 2.17 edges on average.
+DijkstraRouter answered 7 queries and explored 2.00 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
-Loading net-file from 'net.net.xml' ... done (1ms).
-Loading additional-files from 'input_additional.add.xml' ... done (5ms).
-Loading additional-files from 'input_additional2.add.xml' ... done (5ms).
+Loading net-file from 'net.net.xml' ... done (0ms).
+Loading additional-files from 'input_additional.add.xml' ... done (7ms).
+Loading additional-files from 'input_additional2.add.xml' ... done (6ms).
 Loading state from 'state.xml' ... done (6ms).
 Loading done.
-Simulation version v1_20_0+0691-822de6bf232 started with time: 60.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 60.00.
 Simulation ended at time: 269.00
 Reason: All vehicles have left the simulation.
 DijkstraRouter answered 1 queries and explored 3.00 edges on average.
diff --git a/tests/complex/state/rail/save_rail_signal_constraint/state.complex b/tests/complex/state/rail/save_rail_signal_constraint/state.complex
index 842398d73f3..d8c6a27e6fc 100644
--- a/tests/complex/state/rail/save_rail_signal_constraint/state.complex
+++ b/tests/complex/state/rail/save_rail_signal_constraint/state.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 11:03:16 by Eclipse SUMO sumo Version v1_20_0+0691-822de6bf232
+<!-- generated on 2024-10-17 09:42:58 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -28,7 +28,7 @@
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0691-822de6bf232" time="60.00" type="micro" rail="1">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0703-550959f676a" time="60.00" type="micro" rail="1">
     <route id="!t0!var#1" state="0" edges="a b c"/>
     <route id="!t1!var#1" state="0" edges="d e c"/>
     <delay number="2" begin="3" end="1" depart="9.00" time="36.00"/>
@@ -53,7 +53,7 @@
         <vehicles value="t1"/>
     </lane>
     <railSignalConstraintTracker lane="e_0" index="1" state="between t1"/>
-    <driveWay id="gneJ1.d1" edges="a" vehicles="t0"/>
+    <driveWay id="gneJ1.d0" edges="a" vehicles="t0"/>
     <driveWay id="D.1" edges="e c" vehicles="t1"/>
     <subDriveWay id="D.1.0" edges="e" vehicles="t1"/>
 </snapshot>
diff --git a/tests/complex/state/rail/save_rail_signal_constraint/state2.complex b/tests/complex/state/rail/save_rail_signal_constraint/state2.complex
index 81d8244359d..7298c130dc5 100644
--- a/tests/complex/state/rail/save_rail_signal_constraint/state2.complex
+++ b/tests/complex/state/rail/save_rail_signal_constraint/state2.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 11:03:16 by Eclipse SUMO sumo Version v1_20_0+0691-822de6bf232
+<!-- generated on 2024-10-17 09:42:58 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -28,7 +28,7 @@
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0691-822de6bf232" time="10.00" type="micro" rail="1">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0703-550959f676a" time="10.00" type="micro" rail="1">
     <route id="!between" state="0" edges="d e"/>
     <route id="!t0!var#1" state="0" edges="a b c"/>
     <route id="!t1" state="0" edges="d c c"/>
@@ -59,6 +59,6 @@
             <approaching id="between" arrivalTime="25194" arrivalSpeed="13.89" departSpeed="13.89" request="1" arrivalSpeedBraking="0.00" waitingTime="0" distance="238.83"/>
         </link>
     </lane>
-    <driveWay id="gneJ1.d1" edges="a" vehicles="t0"/>
+    <driveWay id="gneJ1.d0" edges="a" vehicles="t0"/>
     <driveWay id="gneJ5.d0" edges="d" vehicles="between"/>
 </snapshot>
diff --git a/tests/complex/state/rail/save_rail_signal_constraint_include/output.complex b/tests/complex/state/rail/save_rail_signal_constraint_include/output.complex
index b3a1d47693b..cfc7c5e51b1 100644
--- a/tests/complex/state/rail/save_rail_signal_constraint_include/output.complex
+++ b/tests/complex/state/rail/save_rail_signal_constraint_include/output.complex
@@ -1,17 +1,17 @@
-Loading net-file from 'net.net.xml' ... done (0ms).
-Loading additional-files from 'input_additional.add.xml' ... done (5ms).
+Loading net-file from 'net.net.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (6ms).
 Loading additional-files from 'input_additional2.add.xml' ... done (5ms).
 Loading done.
-Simulation version v1_20_0+0691-822de6bf232 started with time: 0.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 0.00.
 Simulation ended at time: 269.00
 Reason: All vehicles have left the simulation.
-DijkstraRouter answered 6 queries and explored 2.17 edges on average.
+DijkstraRouter answered 7 queries and explored 2.00 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
 Loading net-file from 'net.net.xml' ... done (0ms).
-Loading additional-files from 'input_additional.add.xml' ... done (5ms).
+Loading additional-files from 'input_additional.add.xml' ... done (9ms).
 Loading state from 'state.xml' ... done (6ms).
 Loading done.
-Simulation version v1_20_0+0691-822de6bf232 started with time: 60.00.
+Simulation version v1_20_0+0703-550959f676a started with time: 60.00.
 Simulation ended at time: 269.00
 Reason: All vehicles have left the simulation.
 DijkstraRouter answered 1 queries and explored 3.00 edges on average.
diff --git a/tests/complex/state/rail/save_rail_signal_constraint_include/state.complex b/tests/complex/state/rail/save_rail_signal_constraint_include/state.complex
index 34f5b7360f7..7537145c7e4 100644
--- a/tests/complex/state/rail/save_rail_signal_constraint_include/state.complex
+++ b/tests/complex/state/rail/save_rail_signal_constraint_include/state.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 11:03:16 by Eclipse SUMO sumo Version v1_20_0+0691-822de6bf232
+<!-- generated on 2024-10-17 09:42:58 by Eclipse SUMO sumo Version v1_20_0+0703-550959f676a
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -29,7 +29,7 @@
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0691-822de6bf232" time="60.00" type="micro" constraints="1" rail="1">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0703-550959f676a" time="60.00" type="micro" constraints="1" rail="1">
     <route id="!t0!var#1" state="0" edges="a b c"/>
     <route id="!t1!var#1" state="0" edges="d e c"/>
     <delay number="2" begin="3" end="1" depart="9.00" time="36.00"/>
@@ -63,7 +63,7 @@
         </bidiPredecessor>
     </railSignalConstraints>
     <railSignalConstraintTracker lane="e_0" index="1" state="between t1"/>
-    <driveWay id="gneJ1.d1" edges="a" vehicles="t0"/>
+    <driveWay id="gneJ1.d0" edges="a" vehicles="t0"/>
     <driveWay id="D.1" edges="e c" vehicles="t1"/>
     <subDriveWay id="D.1.0" edges="e" vehicles="t1"/>
 </snapshot>