Replace itineraries map with a vector #217

sbaldu · 2024-11-18T08:32:05Z

No description provided.

src/dsm/headers/Dynamics.hpp

+    std::transform(itineraries.cbegin(),
+                   itineraries.cend(),
+                   m_itineraries.begin(),
+                   [this](const auto& pItinerary) { return clone(pItinerary); });


src/dsm/headers/Dynamics.hpp

-          buildLog(std::format("Itinerary with id {} not found", itineraryId)));
-    }
+    assert((void("Nodes indexes out of range."),
+            srcNodeId < this->m_graph.nodeSet().size() &&


src/dsm/headers/Dynamics.hpp

+            std::find_if(m_itineraries.begin(),
+                         m_itineraries.end(),
+                         [dstNodeId](const std::unique_ptr<Itinerary>& itinerary) {
+                           return itinerary->destination() == dstNodeId;


src/dsm/headers/Dynamics.hpp

+            std::find_if(m_itineraries.begin(),
+                         m_itineraries.end(),
+                         [dstNodeId](const std::unique_ptr<Itinerary>& itinerary) {
+                           return itinerary->destination() == dstNodeId;


src/dsm/headers/Itinerary.cpp

-    this->m_path.clear();
-  }
+  Itinerary::Itinerary(Id destination, SparseMatrix<bool> path)
+      : m_path{std::move(path)}, m_destination{destination} {}


src/dsm/headers/Itinerary.hpp

    SparseMatrix<bool> m_path;
    Id m_destination;

  public:
    /// @brief Construct a new Itinerary object
    /// @param destination The itinerary's destination
-    Itinerary(Id id, Id destination);
+    Itinerary(Id destination);


test/Test_dynamics.cpp

@@ -176,7 +160,7 @@
      graph.importMatrix("./data/matrix.dsm");
      Dynamics dynamics(graph);
      dynamics.setSeed(69);
-      Itinerary Itinerary1{0, 2}, Itinerary2{1, 1};
+      Itinerary Itinerary1{2}, Itinerary2{1};


test/Test_dynamics.cpp

@@ -351,10 +313,10 @@
          CHECK(dynamics.itineraries().at(0)->path()(0, 1));
          CHECK(dynamics.itineraries().at(0)->path()(1, 2));
          CHECK_FALSE(dynamics.itineraries().at(0)->path()(0, 2));
-          for (auto const& it : dynamics.itineraries()) {
-            auto const& path = it.second->path();
+          for (auto const& itinerary : dynamics.itineraries()) {


test/Test_dynamics.cpp

-      dynamics.addItinerary(it_2);
-      dynamics.addItinerary(it_3);
-      dynamics.updatePaths();
+      std::array<uint32_t, 4> destinationNodes{0, 2, 3, 4};


Grufoony · 2024-11-18T08:42:28Z

src/dsm/headers/Dynamics.hpp

@@ -35,6 +35,11 @@ namespace dsm {

  using TimePoint = long long unsigned int;

+  template <typename T>
+  std::unique_ptr<T> clone(const std::unique_ptr<T>& ptr) {


Does it make sense to have a one-line function?

Grufoony · 2024-11-18T08:43:50Z

src/dsm/headers/Dynamics.hpp

@@ -1142,13 +1161,13 @@ namespace dsm {
  template <typename Delay>
    requires(is_numeric_v<Delay>)
  void Dynamics<Delay>::addItinerary(const Itinerary& itinerary) {
-    m_itineraries.emplace(itinerary.id(), std::make_unique<Itinerary>(itinerary));
+    m_itineraries.push_back(std::make_unique<Itinerary>(itinerary));


emplace_back?

push_back should be better in this case

src/dsm/headers/Dynamics.hpp

@@ -700,27 +707,42 @@

  template <typename Delay>
    requires(is_numeric_v<Delay>)
-  void Dynamics<Delay>::setDestinationNodes(const std::span<Id>& destinationNodes,
+  void Dynamics<Delay>::setDestinationNodes(std::span<Id> destinationNodes,


src/dsm/headers/Dynamics.hpp

+                                [destination](const auto& pItinerary) {
+                                  pItinerary->destination() == destination;
+                                });
+    return (foundIt == m_itineraries.end()) ? nullptr : (*foundIt).get();


src/dsm/headers/Dynamics.hpp

+                       throw std::invalid_argument(
+                           buildLog(std::format("Node with id {} not found", nodeId)));
+                     }
+                     return std::make_unique<Itinerary>(nodeId);


src/dsm/headers/Dynamics.hpp

+    auto foundIt = std::find_if(m_itineraries.begin(),
+                                m_itineraries.end(),
+                                [destination](const auto& pItinerary) {
+                                  return pItinerary->destination() == destination;


src/dsm/headers/Dynamics.hpp

        this->m_uniformDist(this->m_generator) > this->m_errorProbability) {
-      const auto& it = this->m_itineraries[this->m_agents[agentId]->itineraryId()];
+      const auto& it =
+          *std::ranges::find_if(m_itineraries, [this, agentId](const auto& ptr) {


src/dsm/headers/Dynamics.hpp

-      const auto& it = this->m_itineraries[this->m_agents[agentId]->itineraryId()];
+      const auto& it =
+          *std::ranges::find_if(m_itineraries, [this, agentId](const auto& ptr) {
+            return ptr->destination() == m_agents[agentId]->itineraryId();


src/dsm/headers/Dynamics.hpp

@@ -492,7 +500,9 @@
        }
      }
      if (destinationNode->id() ==
-          m_itineraries[m_agents[agentId]->itineraryId()]->destination()) {
+          (*std::ranges::find_if(m_itineraries, [this, agentId](const auto& ptr) {


src/dsm/headers/Dynamics.hpp

@@ -492,7 +500,9 @@
        }
      }
      if (destinationNode->id() ==
-          m_itineraries[m_agents[agentId]->itineraryId()]->destination()) {
+          (*std::ranges::find_if(m_itineraries, [this, agentId](const auto& ptr) {
+            return m_agents[agentId]->itineraryId() == ptr->destination();


src/dsm/headers/Dynamics.hpp

-          if (this->m_itineraries[agent->itineraryId()]->destination() ==
-              street->nodePair().second) {
+
+          if ((*std::ranges::find_if(m_itineraries, [&agent](const auto& ptr) {


src/dsm/headers/Dynamics.hpp

-              street->nodePair().second) {
+
+          if ((*std::ranges::find_if(m_itineraries, [&agent](const auto& ptr) {
+                return ptr->destination() == agent->itineraryId();


src/dsm/headers/Dynamics.hpp

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

View reviewed changes

sbaldu added 3 commits November 18, 2024 09:36

Init Itineraries rework

dd339cf

Update use of itineraries for vector

bf26216

Fix typo

8b07c33

sbaldu force-pushed the rework_itineraries branch from a92fa72 to 8b07c33 Compare November 18, 2024 08:40

Correct use of this

195d43e

Grufoony reviewed Nov 18, 2024

View reviewed changes

sbaldu added 2 commits November 18, 2024 10:03

Use raw pointer in itinerary getter and fix warning

e11341c

Spans are not passed by const& Greg

1f48afb

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

View reviewed changes

sbaldu added 3 commits November 18, 2024 10:10

Fix typos

fc74eda

Formatting

37c2607

Use non-const iterator

5303494

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

View reviewed changes

sbaldu added 2 commits November 18, 2024 10:18

Update examples and benchmarks

8438d19

Update access to vector elements

5b0283e

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

View reviewed changes

sbaldu added 2 commits November 22, 2024 23:55

Fix stalingrado example

2790418

Fix addAgentsUniformly

e167da2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace itineraries map with a vector #217

Replace itineraries map with a vector #217

sbaldu commented Nov 18, 2024

Grufoony Nov 18, 2024

Grufoony Nov 18, 2024

sbaldu Nov 18, 2024

Replace itineraries map with a vector #217

Are you sure you want to change the base?

Replace itineraries map with a vector #217

Conversation

sbaldu commented Nov 18, 2024

Grufoony Nov 18, 2024

Choose a reason for hiding this comment

Grufoony Nov 18, 2024

Choose a reason for hiding this comment

sbaldu Nov 18, 2024

Choose a reason for hiding this comment