Manage multi-lane Traffic Lights #211

Grufoony · 2024-11-12T15:30:59Z

The base idea is adding a new std::pair<double, double> to Traffic Light class.
In this way, we can have four different time intervals:

0 -> delay.first * (1 - pair.first) in which is green for right/straight turns;
delay.first * (1 - pair.first) -> delay.first in which is green for left turns;
delay.first -> delay.first + delay.second * (1 - pair.second) in which is red for right/straight turns;
delay.first + delay.second * (1 - pair.second) -> delay.second in which is red for left turns;

src/dsm/headers/Dynamics.hpp

@@ -475,7 +475,20 @@
      }
      if (destinationNode->isTrafficLight()) {
        auto& tl = dynamic_cast<TrafficLight<Delay>&>(*destinationNode);
-        if (!tl.isGreen(streetId)) {
+        if (tl.leftTurnRatio().has_value()) {


src/dsm/headers/Node.cpp

src/dsm/headers/Node.hpp

+    bool const hasPriority{this->streetPriorities().contains(streetId)};
+    auto const pair{m_delay.value()};
+    if (angle > 0.) {
+      if (hasPriority) {


src/dsm/headers/Node.hpp

+    auto const pair{m_delay.value()};
+    if (angle > 0.) {
+      if (hasPriority) {
+        return m_counter > pair.first * (1. - m_leftTurnRatio.value().first) &&


src/dsm/headers/Node.hpp

+    auto const pair{m_delay.value()};
+    if (angle > 0.) {
+      if (hasPriority) {
+        return m_counter > pair.first * (1. - m_leftTurnRatio.value().first) &&


src/dsm/headers/Node.hpp

+      if (hasPriority) {
+        return m_counter < pair.first * m_leftTurnRatio.value().first;
+      } else {
+        return m_counter > pair.first &&


src/dsm/headers/Node.hpp

+      if (hasPriority) {
+        return m_counter < pair.first * m_leftTurnRatio.value().first;
+      } else {
+        return m_counter > pair.first &&


src/dsm/headers/Node.hpp

src/dsm/headers/Street.cpp

+      deltaAngle -= 2 * std::numbers::pi;
+    } else if (deltaAngle < -std::numbers::pi) {
+      deltaAngle += 2 * std::numbers::pi;
+    }


codecov · 2024-11-12T15:34:52Z

Codecov Report

Attention: Patch coverage is 96.17834% with 6 lines in your changes missing coverage. Please review.

Project coverage is 93.93%. Comparing base (1264b84) to head (40bf3cd).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
src/dsm/headers/Node.hpp	80.00%	5 Missing ⚠️
src/dsm/headers/Dynamics.hpp	92.30%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #211      +/-   ##
==========================================
+ Coverage   93.39%   93.93%   +0.54%     
==========================================
  Files          21       21              
  Lines        3890     4040     +150     
  Branches      359      364       +5     
==========================================
+ Hits         3633     3795     +162     
+ Misses        257      245      -12

Flag	Coverage Δ
unittests	`93.93% <96.17%> (+0.54%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/dsm/headers/Node.hpp

+      }
+    } else {
+      if (hasPriority) {
+        return m_counter < pair.first * (1. - m_leftTurnRatio.value().first);


src/dsm/headers/Node.hpp

+      }
+    } else {
+      if (hasPriority) {
+        return m_counter < pair.first * (1. - m_leftTurnRatio.value().first);


src/dsm/headers/Node.hpp

+        return m_counter < pair.first * (1. - m_leftTurnRatio.value().first);
+      } else {
+        return m_counter > pair.first &&
+               m_counter <


src/dsm/headers/Node.hpp

+      } else {
+        return m_counter > pair.first &&
+               m_counter <
+                   pair.first + pair.second * (1. - m_leftTurnRatio.value().second);


src/dsm/headers/Node.hpp

@@ -164,6 +165,7 @@
    requires(std::unsigned_integral<Delay>)
  class TrafficLight : public Intersection {
  private:
+    std::optional<std::pair<double, double>> m_leftTurnRatio;


src/dsm/headers/Node.hpp

@@ -213,10 +231,16 @@
    /// @return std::optional<Delay> The node's delay
    std::optional<std::pair<Delay, Delay>> delay() const { return m_delay; }
    Delay counter() const { return m_counter; }
+    /// @brief Get the node's left turn ratio
+    /// @return std::optional<std::pair<double, double>> The node's left turn ratio
+    inline std::optional<std::pair<double, double>> leftTurnRatio() const {


src/dsm/headers/Node.hpp

@@ -282,6 +306,15 @@
    m_phase = phase;
  }

+  template <typename Delay>
+    requires(std::unsigned_integral<Delay>)
+  void TrafficLight<Delay>::setLeftTurnRatio(std::pair<double, double> ratio) {


src/dsm/headers/Node.hpp

+    requires(std::unsigned_integral<Delay>)
+  void TrafficLight<Delay>::setLeftTurnRatio(std::pair<double, double> ratio) {
+    assert((void("Left turn ratio components must be between 0 and 1."),
+            ratio.first >= 0. && ratio.first <= 1. && ratio.second >= 0. &&


test/Test_dynamics.cpp

+        "A traffic light managing an intersection with 4 3-lanes streets and 4 1-lane "
+        "streets") {
+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};


test/Test_dynamics.cpp

+        "streets") {
+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};


test/Test_dynamics.cpp

+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};
+      Street s1_2{7, 1, 30., 15., std::make_pair(1, 2), 3};


test/Test_dynamics.cpp

+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};
+      Street s1_2{7, 1, 30., 15., std::make_pair(1, 2), 3};
+      Street s2_1{11, 1, 30., 15., std::make_pair(2, 1), 3};


test/Test_dynamics.cpp

+        "A traffic light managing an intersection with 4 3-lanes streets and 4 1-lane "
+        "streets") {
+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};


test/Test_dynamics.cpp

+        "streets") {
+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};


test/Test_dynamics.cpp

+      // Streets
+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};
+      Street s1_2{7, 1, 30., 15., std::make_pair(1, 2), 3};


test/Test_dynamics.cpp

+      Street s0_1{1, 1, 30., 15., std::make_pair(0, 1), 3};
+      Street s1_0{5, 1, 30., 15., std::make_pair(1, 0), 3};
+      Street s1_2{7, 1, 30., 15., std::make_pair(1, 2), 3};
+      Street s2_1{11, 1, 30., 15., std::make_pair(2, 1), 3};


Init multi-lane Traffic Lights

d08e706

github-advanced-security bot found potential problems Nov 12, 2024

View reviewed changes

Fix

e65cb7a

github-advanced-security bot found potential problems Nov 12, 2024

View reviewed changes

Grufoony added 2 commits November 13, 2024 09:23

Moved new functions in Traffic Light class

3490829

Add first test for left turn probability

15a9f7a

github-advanced-security bot found potential problems Nov 13, 2024

View reviewed changes

Add second test for left turn probability

18d937f

github-advanced-security bot found potential problems Nov 13, 2024

View reviewed changes

Grufoony marked this pull request as ready for review November 13, 2024 08:41

Grufoony requested a review from sbaldu November 13, 2024 08:41

Update version

40bf3cd

sbaldu approved these changes Nov 13, 2024

View reviewed changes

sbaldu merged commit fc68ee9 into main Nov 13, 2024
26 checks passed

Grufoony deleted the feature_multi-lane-TrafficLights branch November 13, 2024 09:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manage multi-lane Traffic Lights #211

Manage multi-lane Traffic Lights #211

Grufoony commented Nov 12, 2024 •

edited

Loading

codecov bot commented Nov 12, 2024 •

edited

Loading

Manage multi-lane Traffic Lights #211

Manage multi-lane Traffic Lights #211

Conversation

Grufoony commented Nov 12, 2024 • edited Loading

codecov bot commented Nov 12, 2024 • edited Loading

Codecov Report

Grufoony commented Nov 12, 2024 •

edited

Loading

codecov bot commented Nov 12, 2024 •

edited

Loading