tls state output and phase names are now working. refs #9520

eclipse-sumo · Nov 12, 2021 · f2812ec · f2812ec
1 parent 19f6564
commit f2812ec
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/microsim/traffic_lights/NEMAController.cpp b/src/microsim/traffic_lights/NEMAController.cpp
@@ -56,8 +56,9 @@ NEMALogic::NEMALogic(MSTLLogicControl& tlcontrol,
         int step, SUMOTime delay,
         const std::map<std::string, std::string>& parameter,
         const std::string& basePath) :
-    MSSimpleTrafficLightLogic(tlcontrol, id, programID, TrafficLightType::NEMA, phases, step, delay, parameter)
-     {
+    MSSimpleTrafficLightLogic(tlcontrol, id, programID, TrafficLightType::NEMA, phases, step, delay, parameter),
+    myPhase(phases[0]->duration, phases[0]->getState())
+{
     myDetectorLength = StringUtils::toDouble(getParameter("detector-length", "20"));
     myDetectorLengthLeftTurnLane = StringUtils::toDouble(getParameter("detector-length-leftTurnLane", "20"));
     myCycleLength = (StringUtils::toDouble(getParameter("total-cycle-length", "60")));
@@ -554,17 +555,20 @@ bool NEMALogic::isDetectorActivated(int phaseIndex) {
     return false;
 }
 
+const MSPhaseDefinition&
+NEMALogic::getCurrentPhaseDef() const {
+    return myPhase;
+}
 
 SUMOTime
 NEMALogic::trySwitch() {
-    std::string state = NEMA_control();
-    for (int i = 0; i < (int)myLinks.size(); i++) {
-        const LinkVector& currGroup = myLinks[i];
-        LinkState ls = (LinkState) state[i];
-        for (MSLink* link : currGroup) {
-            link->setTLState(ls, SIMSTEP);
-        }
+    const std::string newState = NEMA_control();
+    if (newState != myPhase.getState()) {
+        myPhase.setState(newState);
+        // ensure that SwitchCommand::execute notices a change
+        myStep = 1 - myStep;
     }
+    //std::cout << SIMTIME << " " << myPhase.getState() << "\n";
     return TIME2STEPS(1);
 }
 
@@ -727,6 +731,7 @@ NEMALogic::NEMA_control() {
         }
 
     }
+    myPhase.setName(toString(R1Phase) + "+" + toString(R2Phase));
     return outputState;
 }
 

diff --git a/src/microsim/traffic_lights/NEMAController.h b/src/microsim/traffic_lights/NEMAController.h
@@ -83,6 +83,15 @@ class NEMALogic : public MSSimpleTrafficLightLogic {
 
     SUMOTime trySwitch();
 
+    /// @name Dynamic Information Retrieval
+    /// @{
+
+    /** @brief Returns the definition of the current phase
+     * @return The current phase
+     */
+    const MSPhaseDefinition& getCurrentPhaseDef() const;
+    /// @}
+
     /// @brief called when switching programs
     void activateProgram();
     void deactivateProgram();
@@ -271,4 +280,7 @@ class NEMALogic : public MSSimpleTrafficLightLogic {
     std::string outputStateFilePath;
     std::ofstream outputStateFile;
     bool coordinateMode;
+
+    /// @brief virtual phase that holds the current state
+    MSPhaseDefinition myPhase;
 };