Replace itineraries map with a vector #217
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| std::transform(itineraries.cbegin(), | ||
| itineraries.cend(), | ||
| m_itineraries.begin(), | ||
| [this](const auto& pItinerary) { return clone(pItinerary); }); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| buildLog(std::format("Itinerary with id {} not found", itineraryId))); | ||
| } | ||
| assert((void("Nodes indexes out of range."), | ||
| srcNodeId < this->m_graph.nodeSet().size() && |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.1 rule Note
| std::find_if(m_itineraries.begin(), | ||
| m_itineraries.end(), | ||
| [dstNodeId](const std::unique_ptr<Itinerary>& itinerary) { | ||
| return itinerary->destination() == dstNodeId; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| std::find_if(m_itineraries.begin(), | ||
| m_itineraries.end(), | ||
| [dstNodeId](const std::unique_ptr<Itinerary>& itinerary) { | ||
| return itinerary->destination() == dstNodeId; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| this->m_path.clear(); | ||
| } | ||
| Itinerary::Itinerary(Id destination, SparseMatrix<bool> path) | ||
| : m_path{std::move(path)}, m_destination{destination} {} |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| /// @brief Construct a new Itinerary object | ||
| /// @param destination The itinerary's destination | ||
| Itinerary(Id id, Id destination); | ||
| Itinerary(Id destination); |
Check warning
Code scanning / Cppcheck (reported by Codacy)
Class 'Itinerary' has a constructor with 1 argument that is not explicit. Warning
| Dynamics dynamics(graph); | ||
| dynamics.setSeed(69); | ||
| Itinerary Itinerary1{0, 2}, Itinerary2{1, 1}; | ||
| Itinerary Itinerary1{2}, Itinerary2{1}; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note test
| 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()) { |
Check warning
Code scanning / Cppcheck (reported by Codacy)
Local variable 'itinerary' shadows outer variable Warning test
| dynamics.addItinerary(it_2); | ||
| dynamics.addItinerary(it_3); | ||
| dynamics.updatePaths(); | ||
| std::array<uint32_t, 4> destinationNodes{0, 2, 3, 4}; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note test
sbaldu
force-pushed
the
rework_itineraries
branch
from
a92fa72 to
8b07c33
Compare
| using TimePoint = long long unsigned int; | ||
|
|
||
| template <typename T> | ||
| std::unique_ptr<T> clone(const std::unique_ptr<T>& ptr) { |
There was a problem hiding this comment.
Does it make sense to have a one-line function?
| 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)); |
There was a problem hiding this comment.
push_back should be better in this case
| 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, |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| [destination](const auto& pItinerary) { | ||
| pItinerary->destination() == destination; | ||
| }); | ||
| return (foundIt == m_itineraries.end()) ? nullptr : (*foundIt).get(); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| throw std::invalid_argument( | ||
| buildLog(std::format("Node with id {} not found", nodeId))); | ||
| } | ||
| return std::make_unique<Itinerary>(nodeId); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| auto foundIt = std::find_if(m_itineraries.begin(), | ||
| m_itineraries.end(), | ||
| [destination](const auto& pItinerary) { | ||
| return pItinerary->destination() == destination; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| 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) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| 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(); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| } | ||
| if (destinationNode->id() == | ||
| m_itineraries[m_agents[agentId]->itineraryId()]->destination()) { | ||
| (*std::ranges::find_if(m_itineraries, [this, agentId](const auto& ptr) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| 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(); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
| if (this->m_itineraries[agent->itineraryId()]->destination() == | ||
| street->nodePair().second) { | ||
|
|
||
| if ((*std::ranges::find_if(m_itineraries, [&agent](const auto& ptr) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| street->nodePair().second) { | ||
|
|
||
| if ((*std::ranges::find_if(m_itineraries, [&agent](const auto& ptr) { | ||
| return ptr->destination() == agent->itineraryId(); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
|
Better to keep it as a map |
No description provided.