Merge pull request #34 from naviqore/feature/NAV-164-move-tests-into-…

…separate-directory Feature/nav 164 move tests into separate directory
naviqore · Sep 2, 2024 · b8e959a · b8e959a
2 parents d8619e0 + a765c99
commit b8e959a
Show file tree

Hide file tree

Showing 43 changed files with 124 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,7 @@
 /.idea
 /src/schedule/cmake-*/*
 /src/schedule/.idea
-/src/schedule/test/cmake-*/*
+/test/test_schedule/cmake-*/*
 /.vscode
 /output
 /.vs/raptorxx/FileContentIndex

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,13 +45,14 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rel
 add_subdirectory(src/interfaces)
 add_subdirectory(src/logging)
 add_subdirectory(src/geometry)
-add_subdirectory(src/geometry/test)
 add_subdirectory(src/schedule)
-add_subdirectory(src/schedule/test)
+add_subdirectory(test/test_schedule)
 add_subdirectory(src/schedule/benchmarks)
 add_subdirectory(src/raptor)
-add_subdirectory(src/raptor/test)
 add_subdirectory(src/gtfsRaptorConfig)
+# TESTS
+add_subdirectory(test/test_raptor)
+add_subdirectory(test/test_geometry)
 
 include(CTest)
 enable_testing()
diff --git a/src/raptor/CMakeLists.txt b/src/raptor/CMakeLists.txt
@@ -4,54 +4,8 @@ project("raptor"
 
 add_library(${PROJECT_NAME} SHARED)
 
-target_sources(${PROJECT_NAME} PRIVATE
-        src/Leg.h
-        src/LegImpl.cpp
-        src/LegImpl.h
-        src/RaptorAlgorithmFactory.cpp
-        src/RaptorAlgorithmFactory.h
-        src/ConnectionImpl.cpp
-        src/ConnectionImpl.h
-        src/utils/RaptorData.cpp
-        src/utils/RaptorData.h
-        src/utils/RaptorDataBuilder.cpp
-        src/utils/RaptorDataBuilder.h
-        src/utils/RouteBuilder.cpp
-        src/RaptorRouter.cpp
-        src/RaptorRouter.h
-        src/Query.cpp
-        src/Query.h
-        src/utils/StopLabelsAndTimes.cpp
-        src/utils/StopLabelsAndTimes.h
-        src/FootpathRelaxer.cpp
-        src/FootpathRelaxer.h
-        src/RouteScanner.cpp
-        src/RouteScanner.h
-        src/QueryConfig.cpp
-        src/data/ActiveTrip.h
-        src/data/raptorRouteStructures.h
-        src/utils/RouteContainer.cpp
-        src/utils/RouteContainer.h
-        src/LabelPostprocessor.cpp
-        src/LabelPostprocessor.h
-        src/RaptorConnection.cpp
-        src/RaptorConnection.h
-        src/utils/LocalDateTime.cpp
-        src/utils/helperFunctions.h
-        PUBLIC
-        include/RaptorAlgorithm.h
-        include/config/QueryConfig.h
-        include/raptorTypes.h
-        include/IConnection.h
-        include/IRaptor.h
-        include/config/WalkingConfig.h
-        include/config/TransferConfig.h
-        include/usingTypes.h
-        include/config/TravelConfig.h
-        include/RouteBuilder.h
-        include/LocalDateTime.h
-        include/Connection.h
-)
+add_subdirectory(include)
+add_subdirectory(src)
 
 target_include_directories(${PROJECT_NAME}
         PRIVATE

diff --git a/src/raptor/include/CMakeLists.txt b/src/raptor/include/CMakeLists.txt
@@ -0,0 +1,19 @@
+target_sources(${PROJECT_NAME}
+        PUBLIC
+        Connection.h
+        IConnection.h
+        IRaptor.h
+        LocalDateTime.h
+        RaptorAlgorithm.h
+        raptorRouteStructures.h
+        raptorTypes.h
+        RouteBuilder.h
+        usingTypes.h
+        RaptorDataBuilder.h
+        Leg.h
+        RaptorRouter.h
+        RaptorData.h
+        RouteContainer.h
+)
+
+add_subdirectory(config)
diff --git a/src/raptor/src/Leg.h → src/raptor/include/Leg.h b/src/raptor/src/Leg.h → src/raptor/include/Leg.h
@@ -7,9 +7,11 @@
 
 #include <optional>
 #include <string>
+#include <raptor_export.h>
+
 
 namespace raptor {
-  class Leg
+  class RAPTOR_API Leg
   {
   public:
     enum Type

diff --git a/src/raptor/src/utils/RaptorData.h → src/raptor/include/RaptorData.h b/src/raptor/src/utils/RaptorData.h → src/raptor/include/RaptorData.h
@@ -4,19 +4,19 @@
 
 #pragma once
 
-#include <data/raptorRouteStructures.h>
+#include <raptorRouteStructures.h>
+#include <raptor_export.h>
 
 namespace raptor {
 
 
-  class RaptorData
-  {
+  class RAPTOR_API RaptorData {
     StopRoutesIndexLookup lookup;
     StopContext stopContext;
     RouteTraversal routeTraversal;
 
   public:
-    explicit RaptorData(StopRoutesIndexLookup  lookup, StopContext  stopContext, RouteTraversal  routeTraversal);
+    explicit RaptorData(StopRoutesIndexLookup lookup, StopContext stopContext, RouteTraversal routeTraversal);
 
     [[nodiscard]] const StopRoutesIndexLookup& getLookup() const;
 

diff --git a/src/raptor/src/utils/RaptorDataBuilder.h → src/raptor/include/RaptorDataBuilder.h b/src/raptor/src/utils/RaptorDataBuilder.h → src/raptor/include/RaptorDataBuilder.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <utils/RaptorData.h>
+#include "RaptorData.h"
 #include <RouteBuilder.h>
 
 
@@ -15,7 +15,6 @@
 #include <memory>
 #include <unordered_set>
 #include <raptor_export.h>
-// #include "RaptorAlgorithm.h" // Assuming RaptorAlgorithm is already converted to C++
 
 namespace raptor {
 

diff --git a/src/raptor/src/RaptorRouter.h → src/raptor/include/RaptorRouter.h b/src/raptor/src/RaptorRouter.h → src/raptor/include/RaptorRouter.h
@@ -7,7 +7,7 @@
 
 #include "config/QueryConfig.h"
 #include "RaptorAlgorithm.h"
-#include "utils/RaptorData.h"
+#include "RaptorData.h"
 
 #include <map>
 #include <vector>

diff --git a/src/raptor/include/RouteBuilder.h b/src/raptor/include/RouteBuilder.h
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 #include <map>
-#include "utils/RouteContainer.h"
+#include "RouteContainer.h"
 
 #include <raptor_export.h>
 

diff --git a/src/raptor/src/utils/RouteContainer.h → src/raptor/include/RouteContainer.h b/src/raptor/src/utils/RouteContainer.h → src/raptor/include/RouteContainer.h
@@ -4,17 +4,18 @@
 
 #pragma once
 
-#include "data/raptorRouteStructures.h"
+#include "raptorRouteStructures.h"
 
 
 #include <string>
 #include <map>
 #include <vector>
+#include <raptor_export.h>
 
 
 namespace raptor {
 
-  class RouteContainer
+  class RAPTOR_API RouteContainer
   {
   public:
     RouteContainer(std::string  id, const std::map<int, std::string>& stopSequence, const std::map<std::string, std::vector<StopTime>>& trips);

diff --git a/src/raptor/include/config/CMakeLists.txt b/src/raptor/include/config/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${PROJECT_NAME}
+        PUBLIC
+        QueryConfig.h
+        TransferConfig.h
+        TravelConfig.h
+        WalkingConfig.h
+)
diff --git a/src/raptor/src/data/raptorRouteStructures.h → src/raptor/include/raptorRouteStructures.h b/src/raptor/src/data/raptorRouteStructures.h → src/raptor/include/raptorRouteStructures.h
@@ -10,66 +10,67 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <raptor_export.h>
 
 namespace raptor {
 
-  struct RouteStop
+  struct RAPTOR_API RouteStop
   {
     types::raptorIdx stopIndex;
     types::raptorIdx routeIndex;
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct StopTime
+  struct RAPTOR_API StopTime
   {
     types::raptorInt arrival;
     types::raptorInt departure;
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct Route
+  struct RAPTOR_API Route
   {
     std::string id;
-    types::raptorIdx firstRouteStopIndex;
-    types::raptorInt numberOfStops;
-    types::raptorIdx firstStopTimeIndex;
-    types::raptorInt numberOfTrips;
+    types::raptorIdx firstRouteStopIndex{};
+    types::raptorInt numberOfStops{};
+    types::raptorIdx firstStopTimeIndex{};
+    types::raptorInt numberOfTrips{};
     std::vector<std::string> tripIds;
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct Stop
+  struct RAPTOR_API Stop
   {
     std::string id;
-    types::raptorIdx stopRouteIndex;
-    types::raptorInt numberOfRoutes;
-    types::raptorInt sameStopTransferTime;
-    int transferIndex;
-    types::raptorInt numberOfTransfers;
+    types::raptorIdx stopRouteIndex{};
+    types::raptorInt numberOfRoutes{};
+    types::raptorInt sameStopTransferTime{};
+    int transferIndex{};
+    types::raptorInt numberOfTransfers{};
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct Transfer
+  struct RAPTOR_API Transfer
   {
     types::raptorIdx targetStopIndex;
     types::raptorInt duration;
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct StopRoutesIndexLookup
+  struct RAPTOR_API StopRoutesIndexLookup
   {
     std::unordered_map<std::string, types::raptorIdx> stops;
     std::unordered_map<std::string, types::raptorIdx> routes;
   };
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct StopContext
+  struct RAPTOR_API StopContext
   {
     std::vector<Transfer> transfers;
     std::vector<Stop> stops;
@@ -78,7 +79,7 @@ namespace raptor {
 
   //////////////////////////////////////////////////////////////////////////
 
-  struct RouteTraversal
+  struct RAPTOR_API RouteTraversal
   {
     std::vector<RouteStop> routeStops;
     std::vector<StopTime> stopTimes;

diff --git a/src/raptor/include/raptorTypes.h b/src/raptor/include/raptorTypes.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 #include <limits>
+#include <string>
 
 namespace raptor::utils {
   static constexpr auto INFINITY_VALUE = std::numeric_limits<int>::max();

diff --git a/src/raptor/src/CMakeLists.txt b/src/raptor/src/CMakeLists.txt
@@ -0,0 +1,24 @@
+target_sources(${PROJECT_NAME}
+        PRIVATE
+        ConnectionImpl.cpp
+        ConnectionImpl.h
+        FootpathRelaxer.cpp
+        FootpathRelaxer.h
+        LabelPostprocessor.cpp
+        LabelPostprocessor.h
+        LegImpl.cpp
+        LegImpl.h
+        Query.cpp
+        Query.h
+        QueryConfig.cpp
+        RaptorAlgorithmFactory.cpp
+        RaptorAlgorithmFactory.h
+        RaptorConnection.cpp
+        RaptorConnection.h
+        RaptorRouter.cpp
+        RouteScanner.cpp
+        RouteScanner.h
+)
+
+add_subdirectory(data)
+add_subdirectory(utils)
diff --git a/src/raptor/src/FootpathRelaxer.h b/src/raptor/src/FootpathRelaxer.h
@@ -7,7 +7,7 @@
 
 #include "utils/StopLabelsAndTimes.h"
 #include "usingTypes.h"
-#include "utils/RaptorData.h"
+#include "include/RaptorData.h"
 
 #include <vector>
 #include <unordered_set>

diff --git a/src/raptor/src/LabelPostprocessor.cpp b/src/raptor/src/LabelPostprocessor.cpp
@@ -6,7 +6,7 @@
 
 #include "LegImpl.h"
 #include "RaptorConnection.h"
-#include "RaptorRouter.h"
+#include "include/RaptorRouter.h"
 #include "RouteScanner.h"
 
 #include <algorithm>

diff --git a/src/raptor/src/LabelPostprocessor.h b/src/raptor/src/LabelPostprocessor.h
@@ -6,7 +6,7 @@
 
 #include "Connection.h"
 #include "RaptorConnection.h"
-#include "data/raptorRouteStructures.h"
+#include "include/raptorRouteStructures.h"
 #include "usingTypes.h"
 #include "utils/StopLabelsAndTimes.h"
 

diff --git a/src/raptor/src/Query.h b/src/raptor/src/Query.h
@@ -7,7 +7,7 @@
 
 #include "config/QueryConfig.h"
 #include "utils/StopLabelsAndTimes.h"
-#include "utils/RaptorData.h"
+#include "include/RaptorData.h"
 
 #include <vector>
 #include <set>

diff --git a/src/raptor/src/RaptorConnection.h b/src/raptor/src/RaptorConnection.h
@@ -4,7 +4,7 @@
 
 #pragma once
 #include "Connection.h"
-#include "Leg.h"
+#include "include/Leg.h"
 #include "usingTypes.h"
 
 

diff --git a/src/raptor/src/RouteScanner.h b/src/raptor/src/RouteScanner.h
@@ -7,7 +7,7 @@
 
 #include "data/ActiveTrip.h"
 #include "utils/StopLabelsAndTimes.h"
-#include "utils/RaptorData.h"
+#include "include/RaptorData.h"
 
 #include <unordered_set>
 #include <utility>
@@ -23,7 +23,7 @@ namespace raptor {
   public:
     RouteScanner(StopLabelsAndTimes& stopLabelsAndTimes, const RaptorData& raptorData, types::raptorInt minimumTransferDuration);
 
-    std::unordered_set<types::raptorIdx> scan(types::raptorInt round, const std::unordered_set<types::raptorIdx>& markedStops) const;
+    [[nodiscard]] std::unordered_set<types::raptorIdx> scan(types::raptorInt round, const std::unordered_set<types::raptorIdx>& markedStops) const;
 
   private:
     [[nodiscard]] std::unordered_set<types::raptorIdx> getRoutesToScan(const std::unordered_set<types::raptorIdx>& markedStops) const;