Improved evolution algorithm

Author: Grufoony

src/dsm/headers/Dynamics.hpp

@@ -459,7 +459,8 @@ namespace dsm {
   void Dynamics<Delay>::m_evolveStreet(const Id streetId,
                                        const std::unique_ptr<Street>& pStreet,
                                        bool reinsert_agents) {
-    for (auto queueIndex = 0; queueIndex < pStreet->nLanes(); ++queueIndex) {
+    auto const nLanes = pStreet->nLanes();
+    for (auto queueIndex = 0; queueIndex < nLanes; ++queueIndex) {
       if (m_uniformDist(m_generator) > m_maxFlowPercentage ||
           pStreet->queue(queueIndex).empty()) {
         continue;
@@ -475,18 +476,16 @@ namespace dsm {
       }
       if (destinationNode->isTrafficLight()) {
         auto& tl = dynamic_cast<TrafficLight<Delay>&>(*destinationNode);
-        if (tl.leftTurnRatio().has_value()) {
-          auto it = m_agentNextStreetId.find(agentId);
-          if (it == m_agentNextStreetId.end()) {
-            if (!tl.isGreen(streetId, 0.)) {
-              continue;
-            }
-          } else {
-            auto const& nextStreet{m_graph.streetSet()[m_agentNextStreetId[agentId]]};
-            auto const delta{nextStreet->deltaAngle(pStreet->angle())};
-            if (!tl.isGreen(streetId, delta)) {
-              continue;
-            }
+        if (tl.leftTurnRatio().has_value() && nLanes > 1 && queueIndex == nLanes - 1) {
+          if (tl.isGreen(streetId) &&
+              tl.counter() >
+                  tl.delay().value().first * (1. - tl.leftTurnRatio().value().first)) {
+            continue;
+          } else if (!tl.isGreen(streetId) &&
+                     tl.counter() > tl.delay().value().first +
+                                        tl.delay().value().second *
+                                            (1. - tl.leftTurnRatio().value().second)) {
+            continue;
           }
         } else if (!tl.isGreen(streetId)) {
           continue;

src/dsm/headers/Node.hpp

@@ -237,7 +237,6 @@ namespace dsm {
     /// @return bool True if the traffic light is green
     bool isGreen() const;
     bool isGreen(Id streetId) const;
-    bool isGreen(Id streetId, double angle) const;
     bool isTrafficLight() const noexcept override { return true; }
   };
 
@@ -351,33 +350,6 @@ namespace dsm {
     return !hasPriority;
   }
 
-  template <typename Delay>
-    requires(std::unsigned_integral<Delay>)
-  bool TrafficLight<Delay>::isGreen(Id streetId, double angle) const {
-    assert((void("TrafficLight's delay has not been set."), m_delay.has_value()));
-    assert((void("TrafficLight's left turn ratio has not been set."),
-            m_leftTurnRatio.has_value()));
-    bool const hasPriority{this->streetPriorities().contains(streetId)};
-    auto const pair{m_delay.value()};
-    if (angle > 0.) {
-      if (hasPriority) {
-        return m_counter > pair.first * (1. - m_leftTurnRatio.value().first) &&
-               m_counter < pair.first;
-      } else {
-        return m_counter >
-               pair.first + pair.second * (1. - m_leftTurnRatio.value().second);
-      }
-    } else {
-      if (hasPriority) {
-        return m_counter < pair.first * (1. - m_leftTurnRatio.value().first);
-      } else {
-        return m_counter > pair.first &&
-               m_counter <
-                   pair.first + pair.second * (1. - m_leftTurnRatio.value().second);
-      }
-    }
-  }
-
   /// @brief The Roundabout class represents a roundabout node in the network.
   /// @tparam Id The type of the node's id
   /// @tparam Size The type of the node's capacity

test/Test_dynamics.cpp

@@ -686,7 +686,6 @@ TEST_CASE("Dynamics") {
         }
         dynamics.evolve(false);
         dynamics.evolve(false);
-        dynamics.evolve(false);
         THEN("The agent 0 passes and agent 1 waits") {
           CHECK_EQ(dynamics.agents().at(0)->streetId().value(), 7);
           CHECK_EQ(dynamics.agents().at(1)->streetId().value(), 1);