Add test for travelled distance (Fix #250)

Author: Grufoony

src/dsm/dsm.hpp

@@ -6,7 +6,7 @@
 
 static constexpr uint8_t DSM_VERSION_MAJOR = 2;
 static constexpr uint8_t DSM_VERSION_MINOR = 3;
-static constexpr uint8_t DSM_VERSION_PATCH = 12;
+static constexpr uint8_t DSM_VERSION_PATCH = 13;
 
 static auto const DSM_VERSION =
     std::format("{}.{}.{}", DSM_VERSION_MAJOR, DSM_VERSION_MINOR, DSM_VERSION_PATCH);

src/dsm/headers/RoadDynamics.hpp

@@ -274,10 +274,11 @@ namespace dsm {
                                              bool reinsert_agents) {
     auto const nLanes = pStreet->nLanes();
     std::uniform_real_distribution<double> uniformDist{0., 1.};
+    bool bCanPass{true};
     if (pStreet->isStochastic() &&
         (uniformDist(this->m_generator) >
          dynamic_cast<StochasticStreet&>(*pStreet).flowRate())) {
-      return;
+      bCanPass = false;
     }
     for (auto queueIndex = 0; queueIndex < nLanes; ++queueIndex) {
       if (pStreet->queue(queueIndex).empty()) {
@@ -300,10 +301,8 @@ namespace dsm {
           continue;
         }
       }
-      bool bCanPass = true;
-      if (m_passageProbability.has_value()) {
-        bCanPass = uniformDist(this->m_generator) < m_passageProbability.value();
-      }
+      bCanPass = bCanPass &&
+                 (uniformDist(this->m_generator) < m_passageProbability.value_or(1.1));
       bool bArrived{false};
       if (!bCanPass) {
         if (pAgent->isRandom()) {

test/Test_dynamics.cpp

@@ -848,6 +848,36 @@ TEST_CASE("Dynamics") {
         }
       }
     }
+    GIVEN(
+        "A dynamics with one stochastic street and one normal street network and an "
+        "agent") {
+      Street s1{0, std::make_pair(0, 1), 3.};
+      Street s2{1, std::make_pair(1, 2), 1.};
+      Graph graph2;
+      graph2.addStreets(s1, s2);
+      graph2.buildAdj();
+      graph2.makeStochasticStreet(1, 0.3);
+      Dynamics dynamics{graph2, 69};
+      Itinerary itinerary{0, 2};
+      dynamics.addItinerary(itinerary);
+      dynamics.updatePaths();
+      dynamics.addAgent(0, 0, 0);
+      WHEN("We evolve the dynamics") {
+        dynamics.evolve(false);
+        dynamics.evolve(false);
+        dynamics.evolve(false);
+        dynamics.evolve(false);
+        dynamics.evolve(false);
+        dynamics.evolve(false);
+        THEN("The agent has travelled the correct distance") {
+          CHECK_EQ(dynamics.agents().at(0)->time(), 6);
+          CHECK_EQ(dynamics.agents().at(0)->delay(), 0);
+          CHECK_EQ(dynamics.agents().at(0)->streetId().value(), 5);
+          CHECK_EQ(dynamics.agents().at(0)->speed(), 13.8888888889);
+          CHECK_EQ(dynamics.agents().at(0)->distance(), 4.);
+        }
+      }
+    }
   }
   SUBCASE("streetMeanSpeed") {
     /// GIVEN: a dynamics object