Merge branch 'main' into rework_itineraries

Author: sbaldu

.github/workflows/cmake_examples.yml

@@ -7,7 +7,7 @@ on:
     branches: [ "main" ]
 
 env:
-  BUILD_TYPE: Debug
+  BUILD_TYPE: Release
 
 jobs:
   build:

.gitignore

@@ -30,3 +30,5 @@ examples/*.csv
 # Utils generated folders
 __pycache__
 images
+examples/debug
+examples/release

examples/README.md

@@ -4,7 +4,11 @@ Many of these simulations were used as thesis work.
 
 To compile all simulations, use cmake inside the *examples* folder:
 ```shell
-cmake -B build -DCMAKE_BUILD_TYPE=Release && make -C build
+cmake -B release -DCMAKE_BUILD_TYPE=Release && make -C release
+```
+If anything goes wrong, try to build the example in debug mode:
+```shell
+cmake -B debug -DCMAKE_BUILD_TYPE=Debug && make -C debug
 ```
 
 ## Simulation files

examples/data/coordinates.csv

@@ -0,0 +1,121 @@
+nodeId;lat;lon
+119;110;90
+118;100;90
+117;90;90
+116;80;90
+115;70;90
+114;60;90
+113;50;90
+112;40;90
+111;30;90
+110;20;90
+109;10;90
+108;0;90
+107;110;80
+106;100;80
+105;90;80
+104;80;80
+103;70;80
+102;60;80
+101;50;80
+100;40;80
+99;30;80
+98;20;80
+97;10;80
+96;0;80
+95;110;70
+94;100;70
+93;90;70
+92;80;70
+91;70;70
+90;60;70
+89;50;70
+88;40;70
+87;30;70
+86;20;70
+85;10;70
+84;0;70
+83;110;60
+82;100;60
+81;90;60
+80;80;60
+79;70;60
+78;60;60
+77;50;60
+76;40;60
+75;30;60
+74;20;60
+73;10;60
+72;0;60
+71;110;50
+70;100;50
+69;90;50
+68;80;50
+67;70;50
+66;60;50
+65;50;50
+64;40;50
+63;30;50
+62;20;50
+61;10;50
+60;0;50
+59;110;40
+28;40;20
+27;30;20
+26;20;20
+25;10;20
+24;0;20
+23;110;10
+22;100;10
+11;110;0
+21;90;10
+10;100;0
+20;80;10
+9;90;0
+19;70;10
+8;80;0
+18;60;10
+7;70;0
+0;0;0
+13;10;10
+1;10;0
+14;20;10
+12;0;10
+2;20;0
+15;30;10
+3;30;0
+16;40;10
+4;40;0
+17;50;10
+5;50;0
+6;60;0
+29;50;20
+30;60;20
+31;70;20
+32;80;20
+33;90;20
+34;100;20
+35;110;20
+36;0;30
+37;10;30
+38;20;30
+39;30;30
+40;40;30
+41;50;30
+42;60;30
+43;70;30
+44;80;30
+45;90;30
+46;100;30
+47;110;30
+48;0;40
+49;10;40
+50;20;40
+51;30;40
+52;40;40
+53;50;40
+54;60;40
+55;70;40
+56;80;40
+57;90;40
+58;100;40

examples/slow_charge_rb.cpp

@@ -114,6 +114,7 @@ int main(int argc, char** argv) {
   for (const auto& [nodeId, node] : graph.nodeSet()) {
     auto& rb = dynamic_cast<Roundabout&>(*node);
     rb.setCapacity(degreeVector(nodeId));
+    rb.setTransportCapacity(degreeVector(nodeId));
   }
   std::cout << "Done." << std::endl;
 
@@ -189,7 +190,7 @@ int main(int argc, char** argv) {
   // std::vector<int> deltas;
 
   // lauch progress bar
-  std::thread t([]() {
+  std::jthread t([]() {
     while (progress < MAX_TIME && !bExitFlag) {
       printLoadingBar(progress, MAX_TIME);
       std::this_thread::sleep_for(std::chrono::milliseconds(1500));
@@ -302,7 +303,6 @@ int main(int argc, char** argv) {
   //   std::cout << "Probability of turning " << std::quoted(turnNames[i]) << ": " << value * 100 << "%\n";
   //   ++i;
   // }
-  t.join();
   std::cout << '\n';
   std::cout << "Done." << std::endl;
 

examples/slow_charge_tl.cpp

@@ -174,6 +174,7 @@ int main(int argc, char** argv) {
   for (const auto& [nodeId, node] : graph.nodeSet()) {
     auto& tl = dynamic_cast<TrafficLight&>(*node);
     tl.setCapacity(degreeVector(nodeId));
+    tl.setTransportCapacity(degreeVector(nodeId));
     double value = -1.;
     while (value < 0.) {
       value = random();
@@ -292,7 +293,7 @@ int main(int argc, char** argv) {
   // std::vector<int> deltas;
 
   // lauch progress bar
-  std::thread t([]() {
+  std::jthread t([]() {
     while (progress < MAX_TIME && !bExitFlag) {
       printLoadingBar(progress, MAX_TIME);
       std::this_thread::sleep_for(std::chrono::milliseconds(1500));
@@ -449,7 +450,6 @@ int main(int argc, char** argv) {
   //   std::cout << "Probability of turning " << std::quoted(turnNames[i]) << ": " << value * 100 << "%\n";
   //   ++i;
   // }
-  t.join();
   std::cout << '\n';
   std::cout << "Done." << std::endl;
 

examples/stalingrado.cpp

@@ -94,7 +94,7 @@ int main() {
   auto& spire = dynamic_cast<SpireStreet&>(*dynamics.graph().streetSet().at(19));
 
   // lauch progress bar
-  std::thread t([MAX_TIME]() {
+  std::jthread t([MAX_TIME]() {
     while (progress < MAX_TIME) {
       printLoadingBar(progress, MAX_TIME);
       std::this_thread::sleep_for(std::chrono::milliseconds(1500));
@@ -118,7 +118,6 @@ int main() {
     dynamics.evolve(false);
     ++progress;
   }
-  t.join();
 
   return 0;
 }

requirements.txt

@@ -1,3 +1,5 @@
+contextily
+geopandas
 matplotlib
 networkx
 numpy

src/dsm/dsm.hpp

@@ -6,7 +6,7 @@
 
 static constexpr uint8_t DSM_VERSION_MAJOR = 2;
 static constexpr uint8_t DSM_VERSION_MINOR = 1;
-static constexpr uint8_t DSM_VERSION_PATCH = 1;
+static constexpr uint8_t DSM_VERSION_PATCH = 7;
 
 #define DSM_VERSION \
   std::format("{}.{}.{}", DSM_VERSION_MAJOR, DSM_VERSION_MINOR, DSM_VERSION_PATCH)

src/dsm/headers/Dynamics.hpp

@@ -465,7 +465,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;
@@ -481,18 +482,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;
@@ -1147,10 +1146,7 @@ namespace dsm {
   template <typename Delay>
     requires(is_numeric_v<Delay>)
   void Dynamics<Delay>::removeAgent(Size agentId) {
-    assert((void("Trying to remove an agent that does not exist"),
-            std::erase_if(m_agents, [agentId](const auto& agent) {
-              return agent.first == agentId;
-            }) == 1));
+    m_agents.erase(agentId);
   }
 
   template <typename Delay>
@@ -1232,7 +1228,7 @@ namespace dsm {
     std::vector<double> densities;
     densities.reserve(m_graph.streetSet().size());
     for (const auto& [streetId, street] : m_graph.streetSet()) {
-      densities.push_back(normalized ? street->normDensity() : street->density());
+      densities.push_back(street->density(normalized));
     }
     return Measurement<double>(densities);
   }
@@ -1255,9 +1251,9 @@ namespace dsm {
     std::vector<double> flows;
     flows.reserve(m_graph.streetSet().size());
     for (const auto& [streetId, street] : m_graph.streetSet()) {
-      if (above and (street->normDensity() > threshold)) {
+      if (above && (street->density(true) > threshold)) {
         flows.push_back(street->density() * this->streetMeanSpeed(streetId));
-      } else if (!above and (street->normDensity() < threshold)) {
+      } else if (!above && (street->density(true) < threshold)) {
         flows.push_back(street->density() * this->streetMeanSpeed(streetId));
       }
     }
@@ -1387,7 +1383,7 @@ namespace dsm {
     const auto& agent{this->m_agents[agentId]};
     const auto& street{this->m_graph.streetSet()[agent->streetId().value()]};
     double speed{street->maxSpeed() *
-                 (1. - this->m_minSpeedRateo * street->normDensity())};
+                 (1. - this->m_minSpeedRateo * street->density(true))};
     if (this->m_speedFluctuationSTD > 0.) {
       std::normal_distribution<double> speedDist{speed,
                                                  speed * this->m_speedFluctuationSTD};
@@ -1479,11 +1475,11 @@ namespace dsm {
     speeds.reserve(this->m_graph.streetSet().size());
     for (const auto& [streetId, street] : this->m_graph.streetSet()) {
       if (above) {
-        if (street->normDensity() > threshold) {
+        if (street->density(true) > threshold) {
           speeds.push_back(this->streetMeanSpeed(streetId));
         }
       } else {
-        if (street->normDensity() < threshold) {
+        if (street->density(true) < threshold) {
           speeds.push_back(this->streetMeanSpeed(streetId));
         }
       }