Some checks more

Author: Grufoony

src/dsf/mobility/Agent.cpp

@@ -32,11 +32,18 @@ namespace dsf::mobility {
   void Agent::setSrcNodeId(Id srcNodeId) { m_srcNodeId = srcNodeId; }
   void Agent::setStreetId(std::optional<Id> streetId) {
     if (!streetId.has_value()) {
-      assert(m_nextStreetId.has_value());
+      if (!m_nextStreetId.has_value()) {
+        throw std::logic_error(std::format(
+            "Agent {} has no next street id to set the current street id to", m_id));
+      }
       m_streetId = std::exchange(m_nextStreetId, std::nullopt);
       return;
     }
-    assert(m_nextStreetId.has_value() ? streetId == m_nextStreetId.value() : true);
+    if (m_nextStreetId.has_value()) {
+      throw std::logic_error(std::format(
+          "Agent {} has a next street id already set, cannot set street id directly",
+          m_id));
+    }
     m_streetId = streetId;
     m_nextStreetId = std::nullopt;
   }

src/dsf/mobility/Agent.hpp

@@ -127,8 +127,6 @@ struct std::formatter<dsf::mobility::Agent> {
   constexpr auto parse(std::format_parse_context& ctx) { return ctx.begin(); }
   template <typename FormatContext>
   auto format(const dsf::mobility::Agent& agent, FormatContext&& ctx) const {
-    auto const strItinerary = agent.trip().empty() ? std::string("RANDOM")
-                                                   : std::to_string(agent.itineraryId());
     return std::format_to(
         ctx.out(),
         "Agent(id: {}, streetId: {}, srcNodeId: {}, nextStreetId: {}, "
@@ -139,7 +137,7 @@ struct std::formatter<dsf::mobility::Agent> {
         agent.srcNodeId().has_value() ? std::to_string(agent.srcNodeId().value()) : "N/A",
         agent.nextStreetId().has_value() ? std::to_string(agent.nextStreetId().value())
                                          : "N/A",
-        strItinerary,
+        agent.isRandom() ? std::string("RANDOM") : std::to_string(agent.itineraryId()),
         agent.speed(),
         agent.distance(),
         agent.spawnTime(),

test/mobility/Test_agent.cpp

@@ -65,14 +65,15 @@ TEST_CASE("Agent methods") {
   }
   SUBCASE("setStreetId with value") {
     agent.setNextStreetId(55);
-    agent.setStreetId(55);
-    CHECK(agent.streetId().has_value());
+    CHECK_THROWS_AS(agent.setStreetId(55), std::logic_error);
+    CHECK_FALSE(agent.streetId().has_value());
+    agent.setStreetId();
     CHECK_EQ(agent.streetId().value(), 55);
     CHECK_FALSE(agent.nextStreetId().has_value());
   }
   SUBCASE("setStreetId with nullopt uses nextStreetId") {
     agent.setNextStreetId(77);
-    agent.setStreetId(std::nullopt);
+    agent.setStreetId();
     CHECK(agent.streetId().has_value());
     CHECK_EQ(agent.streetId().value(), 77);
   }
@@ -104,7 +105,6 @@ TEST_CASE("Agent methods") {
     agent.setSpeed(10.);
     agent.incrementDistance(5.);
     agent.setFreeTime(99);
-    agent.setNextStreetId(88);
     agent.setStreetId(88);
     agent.updateItinerary();
     agent.reset(555);