refactor move request route classes

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

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 {

src/routes/RequestKeyPoint.h → 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:

src/routes/RequestRoute.h → 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

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
 )