Add support for io flags in importOSMNodes function

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 = 18;
+static constexpr uint8_t DSM_VERSION_PATCH = 19;
 
 static auto const DSM_VERSION =
     std::format("{}.{}.{}", DSM_VERSION_MAJOR, DSM_VERSION_MINOR, DSM_VERSION_PATCH);

src/dsm/headers/Dynamics.hpp

@@ -101,46 +101,60 @@
       Size const dimension = m_graph.adjMatrix().getRowDim();
       auto const destinationID = pItinerary->destination();
       SparseMatrix<bool> path{dimension, dimension};
-      // cycle over the nodes
+
+      // Cache shortest paths to avoid redundant calculations
+      std::unordered_map<Id, std::optional<DijkstraResult>> shortestPaths;
+
       for (const auto& [nodeId, node] : m_graph.nodeSet()) {
-        if (nodeId == destinationID) {
+        if (nodeId == destinationID || m_graph.adjMatrix().getRow(nodeId).empty()) {
           continue;
         }
-        auto result{m_graph.shortestPath(nodeId, destinationID)};
+
+        // Compute and cache shortest path from nodeId to destination
+        auto result = m_graph.shortestPath(nodeId, destinationID);
         if (!result.has_value()) {
+          Logger::warning(
+              std::format("No path found from node {} to {}", nodeId, destinationID));
           continue;
         }
-        // save the minimum distance between i and the destination
-        const auto minDistance{result.value().distance()};
-        for (const auto [nextNodeId, _] : m_graph.adjMatrix().getRow(nodeId)) {
-          if (nextNodeId == destinationID &&
-              minDistance ==
-                  m_graph.streetSet()[nodeId * dimension + nextNodeId]->length()) {
-            path.insert(nodeId, nextNodeId, true);
+
+        const auto minDistance = result.value().distance();
+        shortestPaths[nodeId] = result;  // Cache for reuse
+
+        for (const auto& [nextNodeId, _] : m_graph.adjMatrix().getRow(nodeId)) {
+          if (nextNodeId == destinationID) {
+            if (minDistance ==
+                m_graph.streetSet()[nodeId * dimension + nextNodeId]->length()) {
+              path.insert(nodeId, nextNodeId, true);
+            }
             continue;
           }
-          result = m_graph.shortestPath(nextNodeId, destinationID);
 
-          if (result.has_value()) {
-            // if the shortest path exists, save the distance
+          // Use cached shortest path if available
+          auto it = shortestPaths.find(nextNodeId);
+          if (it == shortestPaths.end()) {
+            shortestPaths[nextNodeId] = m_graph.shortestPath(nextNodeId, destinationID);
+          }
+
+          if (shortestPaths[nextNodeId].has_value()) {
+            const auto nextDistance = shortestPaths[nextNodeId].value().distance();
             if (minDistance ==
-                result.value().distance() +
+                nextDistance +
                     m_graph.streetSet()[nodeId * dimension + nextNodeId]->length()) {
               path.insert(nodeId, nextNodeId, true);
             }
-          } else if ((nextNodeId != destinationID)) {
-            Logger::warning(std::format(
-                "No path found from node {} to node {}", nextNodeId, destinationID));
           }
         }
       }
+
       if (path.size() == 0) {
         Logger::error(
-            std::format("Path with id {} and destination {} is empty. Please "
-                        "check the adjacency matrix.",
+            std::format("Path with id {} and destination {} is empty. Please check the "
+                        "adjacency matrix.",
                         pItinerary->id(),
                         pItinerary->destination()));
       }
+
       pItinerary->setPath(path);
       if (m_bCacheEnabled) {
         pItinerary->path().cache(
@@ -230,6 +244,8 @@
     /// @param itineraries Generic container of itineraries, represented by an std::span
     void addItineraries(std::span<Itinerary> itineraries);
 
+    void enableCache();
+
     /// @brief Reset the simulation time
     void resetTime();
 
@@ -298,7 +314,7 @@
     /// @brief Save the street output counts in csv format
     /// @param filename The name of the file
     /// @param reset If true, the output counts are cleared after the computation
     /// @details NOTE: counts are printed only if the street is a spire
     void saveOutputStreetCounts(const std::string& filename, bool reset = false);
   };
 
@@ -320,13 +336,25 @@
       }
       Logger::info(std::format("Cache enabled (default folder is {})", g_cacheFolder));
     }
+    for (const auto& nodeId : this->m_graph.outputNodes()) {
+      addItinerary(Itinerary{nodeId, nodeId});
+      m_updatePath(m_itineraries.at(nodeId));
+    }
+    // updatePaths();
   }
 
   template <typename agent_t>
   void Dynamics<agent_t>::updatePaths() {
+    if (m_bCacheEnabled) {
+      if (!std::filesystem::exists(g_cacheFolder)) {
+        std::filesystem::create_directory(g_cacheFolder);
+      }
+    }
+
     std::vector<std::thread> threads;
     threads.reserve(m_itineraries.size());
     std::exception_ptr pThreadException;
+    Logger::info(std::format("Init computing {} paths", m_itineraries.size()));
     for (const auto& [itineraryId, itinerary] : m_itineraries) {
       threads.emplace_back(std::thread([this, &itinerary, &pThreadException] {
         try {
@@ -343,6 +371,8 @@
     // Throw the exception launched first
     if (pThreadException)
       std::rethrow_exception(pThreadException);
+
+    Logger::info("End computing paths");
   }
 
   template <typename agent_t>
@@ -371,6 +401,7 @@
           std::format("Agent with id {} already exists.", agent->id())));
     }
     m_agents.emplace(agent->id(), std::move(agent));
+    Logger::debug(std::format("Added agent with id {}", m_agents.rbegin()->first));
   }
 
   template <typename agent_t>
@@ -449,6 +480,12 @@
     });
   }
 
+  template <typename agent_t>
+  void Dynamics<agent_t>::enableCache() {
+    m_bCacheEnabled = true;
+    Logger::info(std::format("Cache enabled (default folder is {})", g_cacheFolder));
+  }
+
   template <typename agent_t>
   void Dynamics<agent_t>::resetTime() {
     m_time = 0;

src/dsm/headers/Graph.hpp

@@ -50,6 +50,8 @@ namespace dsm {
     std::unordered_map<Id, std::unique_ptr<Node>> m_nodes;
     std::unordered_map<Id, std::unique_ptr<Street>> m_streets;
     std::unordered_map<std::string, Id> m_nodeMapping;
+    std::vector<Id> m_inputNodes;
+    std::vector<Id> m_outputNodes;
     SparseMatrix<bool> m_adjacency;
     unsigned long long m_maxAgentCapacity;
 
@@ -80,6 +82,8 @@ namespace dsm {
           });
       m_nodeMapping = other.m_nodeMapping;
       m_adjacency = other.m_adjacency;
+      m_inputNodes = other.m_inputNodes;
+      m_outputNodes = other.m_outputNodes;
     }
 
     Graph& operator=(const Graph& other) {
@@ -94,6 +98,8 @@ namespace dsm {
           });
       m_nodeMapping = other.m_nodeMapping;
       m_adjacency = other.m_adjacency;
+      m_inputNodes = other.m_inputNodes;
+      m_outputNodes = other.m_outputNodes;
 
       return *this;
     }
@@ -261,6 +267,9 @@ namespace dsm {
     /// @return unsigned long long The maximum agent capacity of the graph
     unsigned long long maxCapacity() const { return m_maxAgentCapacity; }
 
+    std::vector<Id> const& inputNodes() const { return m_inputNodes; }
+    std::vector<Id> const& outputNodes() const { return m_outputNodes; }
+
     /// @brief Get the shortest path between two nodes using dijkstra algorithm
     /// @param source The source node
     /// @param destination The destination node

src/dsm/headers/RoadDynamics.hpp

@@ -129,6 +129,8 @@
                            const TContainer& dst_weights,
                            const size_t minNodeDistance = 0);
 
+    void addAgentsRandomly(Size nAgents, const size_t minNodeDistance = 0);
+
     /// @brief Evolve the simulation
     /// @details Evolve the simulation by moving the agents and updating the travel times.
     /// In particular:
@@ -596,6 +598,13 @@
                                                 const TContainer& src_weights,
                                                 const TContainer& dst_weights,
                                                 const size_t minNodeDistance) {
+    Logger::debug(
+        std::format("Init addAgentsRandomly for {} agents from {} nodes to {} nodes with "
+                    "minNodeDistance {}",
+                    nAgents,
+                    src_weights.size(),
+                    dst_weights.size(),
+                    minNodeDistance));
     if (src_weights.size() == 1 && dst_weights.size() == 1 &&
         src_weights.begin()->first == dst_weights.begin()->first) {
       throw std::invalid_argument(Logger::buildExceptionMessage(
@@ -630,6 +639,7 @@
     if (!this->agents().empty()) {
       agentId = this->agents().rbegin()->first + 1;
     }
+    Logger::debug(std::format("Adding {} agents at time {}.", nAgents, this->time()));
     while (nAgents > 0) {
       Id srcId{0}, dstId{0};
       if (dst_weights.size() == 1) {
@@ -683,6 +693,20 @@
     }
   }
 
+  template <typename delay_t>
+    requires(is_numeric_v<delay_t>)
+  void RoadDynamics<delay_t>::addAgentsRandomly(Size nAgents,
+                                                const size_t minNodeDistance) {
+    std::unordered_map<Id, double> src_weights, dst_weights;
+    for (auto const& id : this->m_graph.inputNodes()) {
+      src_weights[id] = 1.;
+    }
+    for (auto const& id : this->m_graph.outputNodes()) {
+      dst_weights[id] = 1.;
+    }
+    addAgentsRandomly(nAgents, src_weights, dst_weights, minNodeDistance);
+  }
+
   template <typename delay_t>
     requires(is_numeric_v<delay_t>)
   void RoadDynamics<delay_t>::evolve(bool reinsert_agents) {

src/dsm/headers/SparseMatrix.hpp

@@ -178,6 +178,8 @@ namespace dsm {
     /// @return number of non zero elements
     Id size() const { return _matrix.size(); };
 
+    bool empty() const { return _matrix.empty(); }
+
     /// @brief get the maximum number of elements in the matrix
     /// @return maximum number of elements
     Id max_size() const { return _rows * _cols; }

src/dsm/sources/Graph.cpp

@@ -1,6 +1,8 @@
 
 #include "../headers/Graph.hpp"
 
+#include <algorithm>
+
 namespace dsm {
   Graph::Graph()
       : m_adjacency{SparseMatrix<bool>()},
@@ -339,13 +341,24 @@
         } else {
           addNode<Intersection>(nodeIndex,
                                 std::make_pair(std::stod(lat), std::stod(lon)));
+          if ((highway.find("in_out") != std::string::npos) ||
+              (highway.find("outgoing_only") != std::string::npos)) {
+            Logger::debug(std::format("Setting node {} as an output node", nodeIndex));
+            m_outputNodes.push_back(nodeIndex);
+          }
+          if ((highway.find("in_out") != std::string::npos) ||
+              (highway.find("incoming_only") != std::string::npos)) {
+            Logger::debug(std::format("Setting node {} as an input node", nodeIndex));
+            m_inputNodes.push_back(nodeIndex);
+          }
         }
         m_nodeMapping.emplace(std::make_pair(id, nodeIndex));
         ++nodeIndex;
       }
     } else {
       Logger::error(std::format("File extension ({}) not supported", fileExt));
     }
+    Logger::info(std::format("Successfully imported {} nodes", nNodes()));
   }
 
   void Graph::importOSMEdges(const std::string& fileName) {
@@ -425,6 +438,7 @@
       throw std::invalid_argument(
           Logger::buildExceptionMessage("File extension not supported"));
     }
+    Logger::info(std::format("Successfully imported {} edges", nEdges()));
   }
 
   void Graph::exportMatrix(std::string path, bool isAdj) {