Init refactoring

Author: Grufoony

src/dsf/mobility/Road.cpp

@@ -22,8 +22,7 @@ namespace dsf::mobility {
         m_length{length},
         m_maxSpeed{maxSpeed},
         m_nLanes{nLanes},
-        m_name{std::move(name)},
-        m_priority{nLanes * 100} {
+        m_name{std::move(name)} {
     if (!(length > 0.)) {
       throw std::invalid_argument(
           std::format("The length of a road ({}) must be greater than 0.", length));
@@ -84,10 +83,6 @@ namespace dsf::mobility {
     }
     m_transportCapacity = transportCapacity;
   }
-  void Road::setPriority(int priority) {
-    assert(priority >= 0);
-    m_priority = priority;
-  }
   Direction Road::turnDirection(double const& previousStreetAngle) const {
     auto const deltaAngle{this->deltaAngle(previousStreetAngle)};
     if (std::abs(deltaAngle) >= std::numbers::pi) {

src/dsf/mobility/Road.hpp

@@ -17,7 +17,7 @@ namespace dsf::mobility {
     int m_capacity;
     double m_transportCapacity;
     std::string m_name;
-    int m_priority;
+    bool m_hasPriority = false;
     std::set<Id> m_forbiddenTurns;  // Stores the forbidden turns (road ids)
 
   public:
@@ -60,9 +60,8 @@ namespace dsf::mobility {
     /// @param transportCapacity The transport capacity
     /// @throws std::invalid_argument If the transport capacity is less or equal to 0
     void setTransportCapacity(double transportCapacity);
-    /// @brief Set the road's priority
-    /// @param priority The road's priority
-    void setPriority(int priority);
+    /// @brief Set the road's priority to true
+    inline void setPriority() { m_hasPriority = true; }
     /// @brief Add a road id to the forbidden turns
     /// @param roadId The road id to add
     void addForbiddenTurn(Id roadId);
@@ -90,7 +89,7 @@ namespace dsf::mobility {
     inline auto const& name() const noexcept { return m_name; }
     /// @brief Get the priority
     /// @return int The priority
-    inline auto priority() const noexcept { return m_priority; }
+    inline auto hasPriority() const noexcept { return m_hasPriority; }
     /// @brief Get the road's forbidden turns
     /// @return std::set<Id> The road's forbidden turns
     /// @details The forbidden turns are the road ids that are not allowed to be used by the agents

src/dsf/mobility/RoadNetwork.cpp

@@ -507,23 +507,10 @@ namespace dsf::mobility {
       auto const& pNode{pair.second};
       auto const& inNeighbours{pNode->ingoingEdges()};
       auto const& outNeighbours{pNode->outgoingEdges()};
-      int maxPriority{0};
-      std::for_each(inNeighbours.cbegin(),
-                    inNeighbours.cend(),
-                    [this, &maxPriority](auto const& edgeId) {
-                      auto const& pStreet{this->edge(edgeId)};
-                      maxPriority = std::max(maxPriority, pStreet->priority());
-                    });
-      std::for_each(outNeighbours.cbegin(),
-                    outNeighbours.cend(),
-                    [this, &maxPriority](auto const& edgeId) {
-                      auto const& pStreet{this->edge(edgeId)};
-                      maxPriority = std::max(maxPriority, pStreet->priority());
-                    });
       std::for_each(
           inNeighbours.cbegin(),
           inNeighbours.cend(),
-          [this, &pNode, &outNeighbours, &maxPriority](auto const& edgeId) {
+          [this, &pNode, &outNeighbours](auto const& edgeId) {
             auto const& pInStreet{this->edge(edgeId)};
             auto const nLanes{pInStreet->nLanes()};
             if (nLanes == 1) {
@@ -533,7 +520,7 @@ namespace dsf::mobility {
             std::for_each(
                 outNeighbours.cbegin(),
                 outNeighbours.cend(),
-                [this, &pInStreet, &allowedTurns, &maxPriority](auto const& edgeId) {
+                [this, &pInStreet, &allowedTurns](auto const& edgeId) {
                   auto const& pOutStreet{this->edge(edgeId)};
                   if (pOutStreet->target() == pInStreet->source() ||
                       pInStreet->forbiddenTurns().contains(pOutStreet->id())) {
@@ -546,8 +533,7 @@ namespace dsf::mobility {
                     return;
                   }
                   // Actually going straight means remain on the same road, thus...
-                  if (((pInStreet->priority() == maxPriority) ==
-                       (outOppositeStreet->get()->priority() == maxPriority)) &&
+                  if ((pInStreet->priority() == outOppositeStreet->get()->priority()) &&
                       !allowedTurns.contains(Direction::STRAIGHT)) {
                     spdlog::debug("Street {} prioritized STRAIGHT", pInStreet->id());
                     if (allowedTurns.contains(Direction::STRAIGHT) &&

test/mobility/Test_street.cpp

@@ -216,7 +216,9 @@ TEST_CASE("Road") {
           CHECK_EQ(road.capacity(),
                    static_cast<int>(std::ceil((100.0 * 2) / Road::meanVehicleLength())));
           CHECK_EQ(road.transportCapacity(), 1.0);
-          CHECK_EQ(road.priority(), 200);  // 2 * 100
+          CHECK_FALSE(road.hasPriority());
+          road.setPriority();
+          CHECK(road.hasPriority());
         }
       }
 
@@ -403,7 +405,7 @@ TEST_CASE("Road") {
              static_cast<int>(std::ceil((100.0 * 2) / Road::meanVehicleLength())));
     CHECK_EQ(road.transportCapacity(), 1.0);
     CHECK_EQ(road.name(), "Test Road");
-    CHECK_EQ(road.priority(), 200);  // 2 * 100
+    CHECK_FALSE(road.hasPriority());
     CHECK(road.forbiddenTurns().empty());
   }