Reorganizing tests

Author: Grufoony

src/dsf/mobility/Intersection.cpp

@@ -19,7 +19,6 @@ namespace dsf::mobility {
     }
     auto iAngle{static_cast<int16_t>(angle * 100)};
     m_agents.emplace(iAngle, std::move(pAgent));
-    ++m_agentCounter;
   }
 
   void Intersection::addAgent(std::unique_ptr<Agent> pAgent) {
@@ -29,10 +28,4 @@ namespace dsf::mobility {
     }
     addAgent(static_cast<double>(lastKey), std::move(pAgent));
   }
-
-  Size Intersection::agentCounter() {
-    Size copy{m_agentCounter};
-    m_agentCounter = 0;
-    return copy;
-  }
 }  // namespace dsf::mobility

src/dsf/mobility/Intersection.hpp

@@ -24,7 +24,6 @@ namespace dsf::mobility {
     std::multimap<int16_t, std::unique_ptr<Agent>> m_agents;
     std::set<Id>
         m_streetPriorities;  // A set containing the street ids that have priority - like main roads
-    Size m_agentCounter;
 
   public:
     /// @brief Construct a new Intersection object
@@ -98,11 +97,6 @@ namespace dsf::mobility {
     /// @brief Get the node's agent ids
     /// @return std::set<Id> A std::set containing the node's agent ids
     std::multimap<int16_t, std::unique_ptr<Agent>>& agents() { return m_agents; };
-    /// @brief Returns the number of agents that have passed through the node
-    /// @return Size The number of agents that have passed through the node
-    /// @details This function returns the number of agents that have passed through the node
-    ///          since the last time this function was called. It also resets the counter.
-    Size agentCounter();
     /// @brief Returns the number of agents currently in the node
     /// @return Size The number of agents currently in the node
     Size nAgents() const { return m_agents.size(); }

src/dsf/mobility/Street.cpp

@@ -181,7 +181,6 @@ namespace dsf::mobility {
     m_flowRate = flowRate;
   }
   double StochasticStreet::flowRate() const { return m_flowRate; }
-  bool StochasticStreet::isStochastic() const { return true; }
 
   void SpireStreet::addAgent(std::unique_ptr<Agent> pAgent) {
     Street::addAgent(std::move(pAgent));

src/dsf/mobility/Street.hpp

@@ -164,7 +164,7 @@ namespace dsf::mobility {
     void setFlowRate(double const flowRate);
     double flowRate() const;
 
-    bool isStochastic() const final;
+    constexpr bool isStochastic() const final { return true; };
   };
 
   /// @brief The SpireStreet class represents a street which is able to count agent flows in both input and output.
@@ -193,7 +193,7 @@ namespace dsf::mobility {
     std::unique_ptr<Agent> dequeue(size_t index) final;
     /// @brief Check if the street is a spire
     /// @return bool True if the street is a spire, false otherwise
-    bool isSpire() const final { return true; };
+    constexpr bool isSpire() const final { return true; };
   };
 
   class StochasticSpireStreet : public StochasticStreet, public Counter {
@@ -214,7 +214,7 @@ namespace dsf::mobility {
     std::unique_ptr<Agent> dequeue(size_t index) final;
     /// @brief Check if the street is a spire
     /// @return bool True if the street is a spire, false otherwise
-    bool isSpire() const final { return true; };
+    constexpr bool isSpire() const final { return true; };
   };
 
 };  // namespace dsf::mobility

test/CMakeLists.txt

@@ -44,8 +44,8 @@ if(NOT rapidcsv_POPULATED)
   FetchContent_MakeAvailable(rapidcsv)
 endif()
 
-# add as executable all cpp files into '.' folder
-file(GLOB TEST_SOURCES "*.cpp")
+# add as executable all cpp files into '.' folder and subdirectories
+file(GLOB TEST_SOURCES "*.cpp" "*/*.cpp")
 file(GLOB SRC_SOURCES "../src/dsf/base/*.cpp" "../src/dsf/mobility/*.cpp" "../src/dsf/utility/*.cpp" "../src/dsf/geometry/*.cpp")
 list(APPEND SOURCES ${TEST_SOURCES} ${SRC_SOURCES})
 

test/Test_agent.cpp

@@ -1,5 +1,5 @@
-#include "../src/dsf/base/AdjacencyMatrix.hpp"
-#include "../src/dsf/mobility/RoadNetwork.hpp"
+#include "../../src/dsf/base/AdjacencyMatrix.hpp"
+#include "../../src/dsf/mobility/RoadNetwork.hpp"
 
 #include "doctest.h"
 

test/Test_AdjacencyMatrix.cpp test/base/Test_AdjacencyMatrix.cpptest/Test_AdjacencyMatrix.cpp renamed to test/base/Test_AdjacencyMatrix.cpp

@@ -1,4 +1,4 @@
-#include "../src/dsf/base/SparseMatrix.hpp"
+#include "../../src/dsf/base/SparseMatrix.hpp"
 
 #include "doctest.h"