Merge pull request #25 from P6-CMMR/test_merged

mtygesen · web-flow · commit 2a09da58cfbb · 2025-04-11T10:35:48.000+02:00
Test merged
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,9 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+# Project root macro
+add_definitions(-DPROJECT_ROOT="${CMAKE_SOURCE_DIR}")
+
 if(WIN32)
     set(CMAKE_CXX_FLAGS_DEBUG "/W4 /Od /DEBUG")
     set(CMAKE_CXX_FLAGS_RELEASE "/O2")
@@ -96,4 +99,6 @@ list(APPEND CMAKE_PREFIX_PATH "${ORTOOLS_EXTRACT_DIR}")
 find_package(ortools REQUIRED)
 
 add_subdirectory(src)
+
+enable_testing()
 add_subdirectory(tests)
diff --git a/include/result.hpp b/include/result.hpp
@@ -30,9 +30,12 @@ class Result {
           _globalAvgDuration(globalAvgDuration),
           _globalAvgCost(globalAvgCost) {}
 
+    explicit Result(const std::filesystem::path &inputPath) { loadResult(inputPath); };
+
     static Result aggregateResults(const Results &results);
 
     void saveToFile(const std::filesystem::path &outputPath, bool prettify) const;
+    void loadResult(const std::filesystem::path &inputPath);
 
     TraceLists getTraceLists() const noexcept;
     SimulatorSettings getSimSettings() const noexcept;
@@ -44,10 +47,10 @@ class Result {
     friend struct glz::meta<Result>;
 
     TraceLists _traceLists;
-    SimulatorSettings _simSettings;
-    size_t _droppedRequests;
-    double _globalAvgDuration;
-    double _globalAvgCost;
+    SimulatorSettings _simSettings{};
+    size_t _droppedRequests{};
+    double _globalAvgDuration{};
+    double _globalAvgCost{};
 };
 
 using Results = std::vector<Result>;
diff --git a/include/scheduler.hpp b/include/scheduler.hpp
@@ -19,7 +19,6 @@ class Scheduler {
     static SchedulerResult scheduleBatch(Environment &env, Requests &requests,
                                          bool useWeightedParking);
 
-   private:
     static constexpr int MAX_SEARCH_TIME = 60000;
     static constexpr int PARKING_NODES_TO_VISIT = 1;
     static constexpr int UNASSIGNED_PENALTY = 10000;
diff --git a/include/trace.hpp b/include/trace.hpp
@@ -11,42 +11,49 @@
 namespace palloc {
 class Assignment {
    public:
+    explicit Assignment() {}
     explicit Assignment(Coordinate dropoffCoordinate, Coordinate parkingCoordinate,
                         uint32_t requestDuration, uint32_t routeDuration)
         : _dropoffCoordinate(dropoffCoordinate),
           _parkingCoordinate(parkingCoordinate),
           _requestDuration(requestDuration),
           _routeDuration(routeDuration) {}
 
+    uint32_t getRequestDuration() const noexcept;
+
    private:
     friend struct glz::meta<Assignment>;
 
-    Coordinate _dropoffCoordinate;
-    Coordinate _parkingCoordinate;
+    Coordinate _dropoffCoordinate{};
+    Coordinate _parkingCoordinate{};
 
-    uint32_t _requestDuration;
-    uint32_t _routeDuration;
+    uint32_t _requestDuration{};
+    uint32_t _routeDuration{};
 };
 
 using Assignments = std::vector<Assignment>;
 
 class Trace {
    public:
+    explicit Trace() {}
     explicit Trace(uint32_t timestep, uint32_t currentTimeOfDay, size_t numberOfRequests,
                    size_t numberOfOngoingSimulations, uint32_t availableParkingSpots, double cost,
-                   double averageDuration, size_t droppedRequests, Assignments assignments)
+                   double averageDuration, size_t droppedRequests, size_t earlyRequests,
+                   Assignments assignments)
         : _assignments(std::move(assignments)),
           _numberOfRequests(numberOfRequests),
           _numberOfOngoingSimulations(numberOfOngoingSimulations),
           _availableParkingSpots(availableParkingSpots),
           _droppedRequests(droppedRequests),
+          _earlyRequests(earlyRequests),
           _timestep(timestep),
           _currentTimeOfDay(currentTimeOfDay),
           _cost(cost),
           _averageDuration(averageDuration) {}
 
     size_t getNumberOfOngoingSimulations() const noexcept;
     size_t getDroppedRequests() const noexcept;
+    size_t getEarlyRequests() const noexcept;
     size_t getNumberOfRequests() const noexcept;
 
     uint32_t getAvailableParkingSpots() const noexcept;
@@ -56,21 +63,24 @@ class Trace {
     double getCost() const noexcept;
     double getAverageDuration() const noexcept;
 
+    Assignments getAssignments() const noexcept;
+
    private:
     friend struct glz::meta<Trace>;
 
     Assignments _assignments;
 
-    size_t _numberOfRequests;
-    size_t _numberOfOngoingSimulations;
-    uint32_t _availableParkingSpots;
-    size_t _droppedRequests;
+    size_t _numberOfRequests{};
+    size_t _numberOfOngoingSimulations{};
+    uint32_t _availableParkingSpots{};
+    size_t _droppedRequests{};
+    size_t _earlyRequests{};
 
-    uint32_t _timestep;
-    uint32_t _currentTimeOfDay;
+    uint32_t _timestep{};
+    uint32_t _currentTimeOfDay{};
 
-    double _cost;
-    double _averageDuration;
+    double _cost{};
+    double _averageDuration{};
 };
 
 using TraceList = std::list<Trace>;
@@ -88,12 +98,13 @@ struct glz::meta<palloc::Assignment> {
 template <>
 struct glz::meta<palloc::Trace> {
     using T = palloc::Trace;
-    static constexpr auto value = glz::object(
-        "timestep", &T::_timestep, "current_time_of_day", &T::_currentTimeOfDay,
-        "number_of_requests", &T::_numberOfRequests, "number_of_ongoing_simulations",
-        &T::_numberOfOngoingSimulations, "available_parking_spots", &T::_availableParkingSpots,
-        "cost", &T::_cost, "average_duration", &T::_averageDuration, "dropped_requests",
-        &T::_droppedRequests, "assignments", &T::_assignments);
+    static constexpr auto value =
+        glz::object("timestep", &T::_timestep, "current_time_of_day", &T::_currentTimeOfDay,
+                    "number_of_requests", &T::_numberOfRequests, "number_of_ongoing_simulations",
+                    &T::_numberOfOngoingSimulations, "available_parking_spots",
+                    &T::_availableParkingSpots, "cost", &T::_cost, "average_duration",
+                    &T::_averageDuration, "dropped_requests", &T::_droppedRequests,
+                    "early_requests", &T::_earlyRequests, "assignments", &T::_assignments);
 };
 
 #endif
diff --git a/scripts/linter.sh b/scripts/linter.sh
@@ -40,7 +40,7 @@ for file in $(find . -name '*.cpp' -o -name '*.hpp' | grep -v -e '^./build/' -e
     
     echo "Running clang-tidy on: $file"
     clang-tidy -p build \
-        -checks='boost-*,bugprone-*,performance-*,readability-*,portability-*,clang-analyzer-*,cppcoreguidelines-*' \
+        -checks='bugprone-*,performance-*,readability-*,portability-*,clang-analyzer-*,cppcoreguidelines-*misc-*' \
         -fix \
         -extra-arg=-std=c++23 \
         -extra-arg=-I$(pwd)/build/include \
diff --git a/scripts/run_experiment.sh b/scripts/run_experiment.sh
@@ -42,7 +42,7 @@ show_help() {
 # Default values
 MAX_DURATION=600
 DURATION_END=0
-MAX_ARRIVAL=60
+MAX_ARRIVAL=0
 ARRIVAL_END=0
 REQUEST_RATE=10.0
 REQUEST_RATE_END=0
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -173,6 +173,10 @@ fi
 echo "Generating environment file..."
 python3 generate_environment.py
 
+echo "Generating test data file..."
+cd ../tests
+python3 generate_test_data.py
+
 echo "Shutting down OSRM backend..."
 sudo docker stop $CONTAINER_ID > /dev/null
 sudo docker rm $CONTAINER_ID > /dev/null
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,11 +1,13 @@
 file(GLOB_RECURSE LIB_SOURCES "${PROJECT_SOURCE_DIR}/src/*.cpp")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*palloc\\.cpp$")
 
-add_library(libpalloc STATIC ${LIB_SOURCES})
-target_include_directories(libpalloc PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(libpalloc PUBLIC ortools::ortools glaze::glaze)
-set_target_properties(libpalloc PROPERTIES PREFIX "")
-
 add_executable(${PROJECT_NAME} "${PROJECT_SOURCE_DIR}/src/palloc.cpp")
-target_link_libraries(${PROJECT_NAME} PRIVATE libpalloc)
-set_source_files_properties(palloc.cpp PROPERTIES COMPILE_FLAGS "-Wno-missing-field-initializers")
+if(LIB_SOURCES)
+    add_library(libpalloc STATIC ${LIB_SOURCES})
+    target_include_directories(libpalloc PUBLIC ${CMAKE_SOURCE_DIR}/include)
+    target_link_libraries(libpalloc PUBLIC ortools::ortools glaze::glaze)
+    set_target_properties(libpalloc PROPERTIES PREFIX "")
+    target_link_libraries(${PROJECT_NAME} PRIVATE libpalloc)
+endif()
+
+set_source_files_properties(${PROJECT_NAME}.cpp PROPERTIES COMPILE_FLAGS "-Wno-missing-field-initializers")
diff --git a/src/result.cpp b/src/result.cpp
@@ -40,6 +40,19 @@ void Result::saveToFile(const std::filesystem::path &outputPath, bool prettify)
     }
 }
 
+void Result::loadResult(const std::filesystem::path &inputPath) {
+    if (!std::filesystem::exists(inputPath)) {
+        throw std::runtime_error("Result file does not exist: " + inputPath.string());
+    }
+
+    const auto error = glz::read_file_json(*this, inputPath.string(), std::string{});
+    if (error) {
+        const auto errorStr = glz::format_error(error, std::string{});
+        throw std::runtime_error("Failed to read result file: " + inputPath.string() +
+                                 "\nwith error: " + errorStr);
+    }
+}
+
 TraceLists Result::getTraceLists() const noexcept { return _traceLists; }
 
 SimulatorSettings Result::getSimSettings() const noexcept { return _simSettings; }
diff --git a/src/simulator.cpp b/src/simulator.cpp
@@ -211,7 +211,7 @@ void Simulator::simulateRun(Environment env, const SimulatorSettings &simSetting
             std::reduce(availableParkingSpots.begin(), availableParkingSpots.end());
         traces.emplace_back(timestep, currentTimeOfDay, requests.size(), simulations.size(),
                             totalAvailableParkingSpots, batchCost, batchAverageDuration,
-                            droppedRequests, assignments);
+                            droppedRequests, earlyRequests.size(), assignments);
 
         runCost += batchCost;
         runDuration += batchAverageDuration;
diff --git a/src/trace.cpp b/src/trace.cpp
@@ -6,6 +6,8 @@ size_t Trace::getNumberOfOngoingSimulations() const noexcept { return _numberOfO
 
 size_t Trace::getDroppedRequests() const noexcept { return _droppedRequests; }
 
+size_t Trace::getEarlyRequests() const noexcept { return _earlyRequests; }
+
 size_t Trace::getNumberOfRequests() const noexcept { return _numberOfRequests; }
 
 uint32_t Trace::getAvailableParkingSpots() const noexcept { return _availableParkingSpots; }
@@ -15,3 +17,7 @@ uint32_t Trace::getTimeStep() const noexcept { return _timestep; }
 double Trace::getCost() const noexcept { return _cost; }
 
 double Trace::getAverageDuration() const noexcept { return _averageDuration; }
+
+Assignments Trace::getAssignments() const noexcept { return _assignments; }
+
+uint32_t Assignment::getRequestDuration() const noexcept { return _requestDuration; }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Catch2
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    enable_testing()
-    
     FetchContent_Declare(
         Catch2 
         GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG v3.8.0
+        GIT_TAG v3.8.1
     )
 
     FetchContent_MakeAvailable(Catch2)
@@ -15,8 +13,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     if (TEST_SOURCES)
         message(STATUS "Found test sources: ${TEST_SOURCES}")
         add_executable(palloc_tests ${TEST_SOURCES})
-        target_link_libraries(palloc_tests PRIVATE palloclib Catch2::Catch2WithMain)
-
+        target_link_libraries(palloc_tests PRIVATE libpalloc Catch2::Catch2WithMain)
+        
         include(CTest)
         include(Catch)
         catch_discover_tests(palloc_tests)
diff --git a/tests/generate_test_data.py b/tests/generate_test_data.py
@@ -0,0 +1,18 @@
+import json
+ 
+# Data to be written
+dictionary = {
+"dropoff_to_parking": [[1, 2, 3], [4, 5, 6], [7, 8, 9]], 
+"parking_to_dropoff": [[1, 2, 3], [4, 5, 6], [7, 8, 9]], 
+"parking_capacities": [3, 5, 9], 
+"dropoff_coords": [{"latitude": 11, "longitude": 12}, {"latitude": 14, "longitude": 15}, {"latitude": 16, "longitude": 17}], 
+"parking_coords": [{"latitude": 56, "longitude": 57}, {"latitude": 58, "longitude": 59}, {"latitude": 60, "longitude": 61}], 
+"smallest_round_trips": [2, 6, 10]
+}
+ 
+# Serializing json
+json_object = json.dumps(dictionary, indent=4)
+ 
+# Writing to sample.json
+with open("test_data.json", "w") as outfile:
+    outfile.write(json_object)
diff --git a/tests/request_generator_test.cpp b/tests/request_generator_test.cpp
@@ -0,0 +1,32 @@
+#include "request_generator.hpp"
+
+#include "catch2/catch_test_macros.hpp"
+
+using namespace palloc;
+
+TEST_CASE("Base case - [Request Generator]") {
+    constexpr int requestRate = 10;
+    constexpr int maxTimeTillArrival = 5;
+    constexpr int maxRequestDuration = 10;
+    constexpr int dropoffNodes = 3;
+
+    RequestGenerator generator({.dropoffNodes = dropoffNodes,
+                                .maxTimeTillArrival = maxTimeTillArrival,
+                                .maxRequestDuration = maxRequestDuration,
+                                .seed = 1,
+                                .requestRate = requestRate});
+
+    constexpr uint32_t testRequestAmount = 1000;
+    constexpr auto minRate = std::min(requestRate, 100);
+    const size_t upperBound = minRate + 3 * std::sqrt(minRate);
+    for (uint32_t i = 0; i < testRequestAmount; ++i) {
+        const auto newRequests = generator.generate(i);
+
+        REQUIRE(newRequests.size() <= upperBound);
+        for (const Request &request : newRequests) {
+            REQUIRE(request.getArrival() <= maxTimeTillArrival);
+            REQUIRE(request.getDropoffNode() <= dropoffNodes);
+            REQUIRE(request.getRequestDuration() <= maxRequestDuration);
+        }
+    }
+}
diff --git a/tests/scheduler_test.cpp b/tests/scheduler_test.cpp
diff --git a/tests/simulator_test.cpp b/tests/simulator_test.cpp
