fix #13412

eclipse-sumo · Jun 21, 2023 · 6e9242a · 6e9242a
1 parent 221b5dc
commit 6e9242a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/src/microsim/traffic_lights/MSTrafficLightLogic.cpp b/src/microsim/traffic_lights/MSTrafficLightLogic.cpp
@@ -264,10 +264,9 @@ MSTrafficLightLogic::init(NLDetectorBuilder&) {
                                     for (MSPhaseDefinition* p : phases) {
                                         if (minor.find(p->getState()[tlu]) != std::string::npos
                                                 && minor.find(p->getState()[tlv]) != std::string::npos) {
-                                            WRITE_ERRORF(TL("Program '%' at tlLogic '%' is incompatible with logic at junction '%' (mutual conflict between link indices %,% tl indices %,% phase %).\n"
-                                                            "  Rebuild the network with option '--tls.ignore-internal-junction-jam' or include the program when building."),
-                                                         getProgramID(), getID(), junction->getID(), u, v, tlu, tlv, phaseIndex);
-                                            return;
+                                            throw ProcessError(TLF("Program '%' at tlLogic '%' is incompatible with logic at junction '%' (mutual conflict between link indices %,% tl indices %,% phase %).\n"
+                                                            "  Rebuild the network with option '--tls.ignore-internal-junction-jam' or include the program when building.",
+                                                         getProgramID(), getID(), junction->getID(), u, v, tlu, tlv, phaseIndex));
                                         }
                                         phaseIndex++;
                                     }

diff --git a/src/netload/NLBuilder.cpp b/src/netload/NLBuilder.cpp
@@ -220,6 +220,8 @@ NLBuilder::build() {
         }
         MSTriggeredRerouter::checkParkingRerouteConsistency();
     }
+    // init tls after all detectors have been loaded
+    myJunctionBuilder.postLoadInitialization();
     // declare meandata set by options
     buildDefaultMeanData("edgedata-output", "DEFAULT_EDGEDATA", false);
     buildDefaultMeanData("lanedata-output", "DEFAULT_LANEDATA", true);

diff --git a/src/netload/NLJunctionControlBuilder.cpp b/src/netload/NLJunctionControlBuilder.cpp
@@ -255,7 +255,7 @@ NLJunctionControlBuilder::closeTrafficLightLogic(const std::string& basePath) {
                 // parameters that are used when initializing a logic will not take
                 // effect but parameters that are checked at runtime can be used
                 // here (i.e. device.glosa.range)
-                existing->updateParameters(myAdditionalParameter);
+                myLogicParams[existing] = myAdditionalParameter;
                 return;
             }
         }
@@ -336,9 +336,9 @@ NLJunctionControlBuilder::closeTrafficLightLogic(const std::string& basePath) {
     if (tlLogic != nullptr) {
         if (getTLLogicControlToUse().add(myActiveKey, myActiveProgram, tlLogic)) {
             if (myNetIsLoaded) {
-                tlLogic->init(myDetectorBuilder);
+                myAdditionalLogics.push_back(tlLogic);
             } else {
-                myLogics2PostLoadInit.push_back(tlLogic);
+                myNetworkLogics.push_back(tlLogic);
             }
         } else {
             WRITE_ERRORF(TL("Another logic with id '%' and programID '%' exists."), myActiveKey, myActiveProgram);
@@ -466,11 +466,11 @@ NLJunctionControlBuilder::closeFunction() {
 
 MSTLLogicControl*
 NLJunctionControlBuilder::buildTLLogics() {
-    postLoadInitialization(); // must happen after edgeBuilder is finished
     if (!myLogicControl->closeNetworkReading()) {
         throw ProcessError(TL("Traffic lights could not be built."));
     }
     MSTLLogicControl* ret = myLogicControl;
+    myNetIsLoaded = true;
     myLogicControl = nullptr;
     return ret;
 }
@@ -506,10 +506,16 @@ NLJunctionControlBuilder::getActiveSubKey() const {
 
 void
 NLJunctionControlBuilder::postLoadInitialization() {
-    for (MSTrafficLightLogic* const logic : myLogics2PostLoadInit) {
+    for (MSTrafficLightLogic* const logic : myNetworkLogics) {
         logic->init(myDetectorBuilder);
     }
-    myNetIsLoaded = true;
+    for (MSTrafficLightLogic* const logic : myAdditionalLogics) {
+        logic->init(myDetectorBuilder);
+    }
+    // delay parameter loading until initialization
+    for (auto item : myLogicParams) {
+        item.first->updateParameters(item.second);
+    }
 }
 
 

diff --git a/src/netload/NLJunctionControlBuilder.h b/src/netload/NLJunctionControlBuilder.h
@@ -259,6 +259,10 @@ class NLJunctionControlBuilder {
         return myActivePhases;
     }
 
+    void netIsLoaded() {
+        myNetIsLoaded = true;
+    }
+
 protected:
     /// @name Factory methods, virtual so that other versions of the structures can be built
     /// @{
@@ -362,15 +366,17 @@ class NLJunctionControlBuilder {
     /// @brief the name of the current junction
     std::string myActiveName;
 
+    /// @brief Definition of a parameter map (key->value)
+    typedef Parameterised::Map StringParameterMap;
+
     /// @brief The container for information which junctions shall be initialised using which values
-    std::vector<MSTrafficLightLogic*> myLogics2PostLoadInit;
+    std::vector<MSTrafficLightLogic*> myNetworkLogics;
+    std::vector<MSTrafficLightLogic*> myAdditionalLogics;
+    std::map<MSTrafficLightLogic*, StringParameterMap> myLogicParams;
 
     /// @brief The tls control to use (0 if net's tls control shall be used)
     mutable MSTLLogicControl* myLogicControl;
 
-    /// @brief Definition of a parameter map (key->value)
-    typedef Parameterised::Map StringParameterMap;
-
     /// @brief Parameter map (key->value)
     StringParameterMap myAdditionalParameter;
 
@@ -389,4 +395,5 @@ class NLJunctionControlBuilder {
     /// @brief whether the network has been loaded
     bool myNetIsLoaded;
 
+
 };