From 97c00655d78855ea059903bf88c9031bad6f99ad Mon Sep 17 00:00:00 2001
From: Romain BERNARD <romain.bernard@uca.fr>
Date: Thu, 20 Jun 2024 10:22:31 +0200
Subject: [PATCH] refactor move request route classes

---
 CMakeLists.txt                                |  8 ++++----
 src/instance/requests/Request.h               |  2 +-
 src/routes/{ => requests}/RequestKeyPoint.cpp |  0
 src/routes/{ => requests}/RequestKeyPoint.h   |  6 +++---
 src/routes/{ => requests}/RequestRoute.cpp    |  0
 src/routes/{ => requests}/RequestRoute.h      |  2 +-
 test/CMakeLists.txt                           | 16 ++++++++--------
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename src/routes/{ => requests}/RequestKeyPoint.cpp (100%)
 rename src/routes/{ => requests}/RequestKeyPoint.h (91%)
 rename src/routes/{ => requests}/RequestRoute.cpp (100%)
 rename src/routes/{ => requests}/RequestRoute.h (96%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60080e1..b279b6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,16 +40,16 @@ add_executable(GreedyAlgorithm
         src/ShortestPath/Transit/TransitAlgorithmState.h
         src/ShortestPath/Transit/TransitShortestPathContainer.cpp
         src/ShortestPath/Transit/TransitShortestPathContainer.h
-        src/routes/RequestRoute.cpp
-        src/routes/RequestRoute.h
+        src/routes/requests/RequestRoute.cpp
+        src/routes/requests/RequestRoute.h
         src/routes/vehicle/SAEVRoute.cpp
         src/routes/vehicle/SAEVRoute.h
         src/TimeWindow.cpp
         src/TimeWindow.h
         src/routes/KeyPoint.cpp
         src/routes/KeyPoint.h
-        src/routes/RequestKeyPoint.cpp
-        src/routes/RequestKeyPoint.h
+        src/routes/requests/RequestKeyPoint.cpp
+        src/routes/requests/RequestKeyPoint.h
         src/routes/vehicle/SAEVKeyPoint.cpp
         src/routes/vehicle/SAEVKeyPoint.h
         src/instance/SAEVehicle.cpp
diff --git a/src/instance/requests/Request.h b/src/instance/requests/Request.h
index bec3589..df95f2f 100644
--- a/src/instance/requests/Request.h
+++ b/src/instance/requests/Request.h
@@ -7,7 +7,7 @@
 
 
 #include "../../TimeWindow.h"
-#include "../../routes/RequestRoute.h"
+#include "../../routes/requests/RequestRoute.h"
 #include "../graph/Graph.h"
 
 class Request {
diff --git a/src/routes/RequestKeyPoint.cpp b/src/routes/requests/RequestKeyPoint.cpp
similarity index 100%
rename from src/routes/RequestKeyPoint.cpp
rename to src/routes/requests/RequestKeyPoint.cpp
diff --git a/src/routes/RequestKeyPoint.h b/src/routes/requests/RequestKeyPoint.h
similarity index 91%
rename from src/routes/RequestKeyPoint.h
rename to src/routes/requests/RequestKeyPoint.h
index 4794e5b..f96e2b9 100644
--- a/src/routes/RequestKeyPoint.h
+++ b/src/routes/requests/RequestKeyPoint.h
@@ -6,9 +6,9 @@
 #define GREEDYALGORITHM_REQUESTKEYPOINT_H
 
 
-#include "KeyPoint.h"
-#include "../instance/SAEVehicle.h"
-#include "../instance/graph/LineStop.h"
+#include "../KeyPoint.h"
+#include "../../instance/SAEVehicle.h"
+#include "../../instance/graph/LineStop.h"
 
 class RequestKeyPoint : public KeyPoint {
 private:
diff --git a/src/routes/RequestRoute.cpp b/src/routes/requests/RequestRoute.cpp
similarity index 100%
rename from src/routes/RequestRoute.cpp
rename to src/routes/requests/RequestRoute.cpp
diff --git a/src/routes/RequestRoute.h b/src/routes/requests/RequestRoute.h
similarity index 96%
rename from src/routes/RequestRoute.h
rename to src/routes/requests/RequestRoute.h
index a32911c..d9f3bf1 100644
--- a/src/routes/RequestRoute.h
+++ b/src/routes/requests/RequestRoute.h
@@ -41,6 +41,6 @@ public:
     void resetKeyPoint(int routeIndex);
 };
 
-#include "../instance/requests/Request.h"
+#include "../../instance/requests/Request.h"
 
 #endif //GREEDYALGORITHM_REQUESTROUTE_H
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bb085d9..cc5c263 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -62,10 +62,10 @@ add_executable(Constraint_Propag_DEB
         ../src/routes/vehicle/SAEVKeyPoint.h
         ../src/routes/KeyPoint.cpp
         ../src/routes/KeyPoint.h
-        ../src/routes/RequestKeyPoint.cpp
-        ../src/routes/RequestKeyPoint.h
-        ../src/routes/RequestRoute.cpp
-        ../src/routes/RequestRoute.h
+        ../src/routes/requests/RequestKeyPoint.cpp
+        ../src/routes/requests/RequestKeyPoint.h
+        ../src/routes/requests/RequestRoute.cpp
+        ../src/routes/requests/RequestRoute.h
         "../src/utils/Instance Generation/Requests/RequestsGenerator.cpp"
         "../src/utils/Instance Generation/Requests/RequestsGenerator.h"
         "../src/utils/Instance Generation/Requests/RequestGenerationParameters.h"
@@ -96,10 +96,10 @@ add_executable(BestInsertionHeuristic_DEB
         ../src/routes/vehicle/SAEVKeyPoint.h
         ../src/routes/KeyPoint.cpp
         ../src/routes/KeyPoint.h
-        ../src/routes/RequestKeyPoint.cpp
-        ../src/routes/RequestKeyPoint.h
-        ../src/routes/RequestRoute.cpp
-        ../src/routes/RequestRoute.h
+        ../src/routes/requests/RequestKeyPoint.cpp
+        ../src/routes/requests/RequestKeyPoint.h
+        ../src/routes/requests/RequestRoute.cpp
+        ../src/routes/requests/RequestRoute.h
         ../src/routes/vehicle/BestRequestInsertion.h
         ../src/routes/vehicle/BestInsertionQueue.h
 )
-- 
GitLab