refactor: organize files into groups

mvirgo · May 7, 2021 · 9bad88f · 9bad88f
1 parent c1e5b5f
commit 9bad88f
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,4 +17,10 @@ file(GLOB_RECURSE project_SRCS src/*.cpp src/*.h)
 
 # Add project executable
 add_executable(rideshare_simulation ${project_SRCS})
+
+# Include project directories
+target_include_directories(rideshare_simulation PUBLIC src)
+target_include_directories(rideshare_simulation PUBLIC src/*)
+
+# Link everything together
 target_link_libraries(rideshare_simulation pugixml ${OpenCV_LIBRARIES})
diff --git a/src/ConcurrentObject.cpp → src/concurrent/ConcurrentObject.cpp b/src/ConcurrentObject.cpp → src/concurrent/ConcurrentObject.cpp
@@ -1,4 +1,5 @@
 #include "ConcurrentObject.h"
+
 #include <algorithm>
 
 namespace rideshare {

diff --git a/src/ConcurrentObject.h → src/concurrent/ConcurrentObject.h b/src/ConcurrentObject.h → src/concurrent/ConcurrentObject.h
@@ -6,9 +6,6 @@
 #include <thread>
 #include <vector>
 
-#include "RouteModel.h"
-#include "RoutePlanner.h"
-
 namespace rideshare {
 
 class ConcurrentObject {

diff --git a/src/ObjectHolder.h → src/concurrent/ObjectHolder.h b/src/ObjectHolder.h → src/concurrent/ObjectHolder.h
@@ -1,8 +1,8 @@
 #ifndef OBJECT_HOLDER_H_
 #define OBJECT_HOLDER_H_
 
-#include "RouteModel.h"
-#include "RoutePlanner.h"
+#include "mapping/RouteModel.h"
+#include "routing/RoutePlanner.h"
 
 namespace rideshare {
 

diff --git a/src/PassengerQueue.cpp → src/concurrent/PassengerQueue.cpp b/src/PassengerQueue.cpp → src/concurrent/PassengerQueue.cpp
@@ -1,11 +1,12 @@
 #include "PassengerQueue.h"
+
 #include <chrono>
 #include <mutex>
 
-#include "Passenger.h"
 #include "RideMatcher.h"
-#include "RouteModel.h"
-#include "RoutePlanner.h"
+#include "mapping/RouteModel.h"
+#include "map_object/Passenger.h"
+#include "routing/RoutePlanner.h"
 
 namespace rideshare {
 

diff --git a/src/PassengerQueue.h → src/concurrent/PassengerQueue.h b/src/PassengerQueue.h → src/concurrent/PassengerQueue.h
@@ -6,9 +6,9 @@
 
 #include "ConcurrentObject.h"
 #include "ObjectHolder.h"
-#include "Passenger.h"
-#include "RouteModel.h"
-#include "RoutePlanner.h"
+#include "mapping/RouteModel.h"
+#include "map_object/Passenger.h"
+#include "routing/RoutePlanner.h"
 
 // Avoid circular includes
 namespace rideshare {

diff --git a/src/RideMatcher.cpp → src/concurrent/RideMatcher.cpp b/src/RideMatcher.cpp → src/concurrent/RideMatcher.cpp
@@ -2,9 +2,9 @@
 
 #include <algorithm>
 
-#include "Passenger.h"
 #include "PassengerQueue.h"
 #include "VehicleManager.h"
+#include "map_object/Passenger.h"
 
 namespace rideshare {
 

diff --git a/src/RideMatcher.h → src/concurrent/RideMatcher.h b/src/RideMatcher.h → src/concurrent/RideMatcher.h
@@ -6,9 +6,9 @@
 #include <thread>
 
 #include "ConcurrentObject.h"
-#include "Passenger.h"
 #include "PassengerQueue.h"
 #include "VehicleManager.h"
+#include "map_object/Passenger.h"
 
 namespace rideshare {
 

diff --git a/src/VehicleManager.cpp → src/concurrent/VehicleManager.cpp b/src/VehicleManager.cpp → src/concurrent/VehicleManager.cpp
@@ -1,12 +1,13 @@
 #include "VehicleManager.h"
+
 #include <cmath>
 
-#include "Coordinate.h"
-#include "Passenger.h"
-#include "RouteModel.h"
-#include "RoutePlanner.h"
 #include "RideMatcher.h"
-#include "Vehicle.h"
+#include "mapping/Coordinate.h"
+#include "mapping/RouteModel.h"
+#include "map_object/Passenger.h"
+#include "map_object/Vehicle.h"
+#include "routing/RoutePlanner.h"
 
 namespace rideshare {
 

diff --git a/src/VehicleManager.h → src/concurrent/VehicleManager.h b/src/VehicleManager.h → src/concurrent/VehicleManager.h
@@ -5,12 +5,12 @@
 #include <vector>
 
 #include "ConcurrentObject.h"
-#include "Coordinate.h"
 #include "ObjectHolder.h"
-#include "Passenger.h"
-#include "RouteModel.h"
-#include "RoutePlanner.h"
-#include "Vehicle.h"
+#include "mapping/Coordinate.h"
+#include "mapping/RouteModel.h"
+#include "map_object/Passenger.h"
+#include "map_object/Vehicle.h"
+#include "routing/RoutePlanner.h"
 
 // Avoid circular includes
 namespace rideshare {

diff --git a/src/main.cpp b/src/main.cpp
@@ -6,12 +6,13 @@
 #include <set>
 #include <string>
 #include <vector>
-#include "RouteModel.h"
-#include "Graphics.h"
-#include "PassengerQueue.h"
-#include "RideMatcher.h"
-#include "RoutePlanner.h"
-#include "VehicleManager.h"
+
+#include "concurrent/PassengerQueue.h"
+#include "concurrent/RideMatcher.h"
+#include "concurrent/VehicleManager.h"
+#include "mapping/RouteModel.h"
+#include "routing/RoutePlanner.h"
+#include "visual/Graphics.h"
 
 static std::optional<std::vector<std::byte>> ReadFile(const std::string &path) {   
     std::ifstream is{path, std::ios::binary | std::ios::ate};

diff --git a/src/MapObject.h → src/map_object/MapObject.h b/src/MapObject.h → src/map_object/MapObject.h
@@ -4,8 +4,8 @@
 #include <cstdlib>
 #include <vector>
 
-#include "Coordinate.h"
-#include "Model.h"
+#include "mapping/Coordinate.h"
+#include "mapping/Model.h"
 
 namespace rideshare {
 

diff --git a/src/Passenger.h → src/map_object/Passenger.h b/src/Passenger.h → src/map_object/Passenger.h
diff --git a/src/Vehicle.cpp → src/map_object/Vehicle.cpp b/src/Vehicle.cpp → src/map_object/Vehicle.cpp
@@ -1,6 +1,6 @@
 #include "Vehicle.h"
 
-#include "Coordinate.h"
+#include "mapping/Coordinate.h"
 #include "Passenger.h"
 
 namespace rideshare {

diff --git a/src/Vehicle.h → src/map_object/Vehicle.h b/src/Vehicle.h → src/map_object/Vehicle.h
@@ -4,10 +4,10 @@
 #include <memory>
 #include <vector>
 
-#include "Coordinate.h"
 #include "MapObject.h"
-#include "Passenger.h"
-#include "RouteModel.h"
+#include "mapping/Coordinate.h"
+#include "mapping/RouteModel.h"
+#include "map_object/Passenger.h"
 
 namespace rideshare {
 

diff --git a/src/Coordinate.h → src/mapping/Coordinate.h b/src/Coordinate.h → src/mapping/Coordinate.h
diff --git a/src/Model.cpp → src/mapping/Model.cpp b/src/Model.cpp → src/mapping/Model.cpp
@@ -3,14 +3,16 @@
 */
 
 #include "Model.h"
-#include "pugixml.hpp"
+
 #include <iostream>
 #include <string_view>
 #include <cmath>
 #include <cstdlib>
 #include <algorithm>
 #include <assert.h>
 
+#include "pugixml.hpp"
+
 #include "Coordinate.h"
 
 namespace rideshare {

diff --git a/src/Model.h → src/mapping/Model.h b/src/Model.h → src/mapping/Model.h
diff --git a/src/RouteModel.cpp → src/mapping/RouteModel.cpp b/src/RouteModel.cpp → src/mapping/RouteModel.cpp
@@ -3,6 +3,7 @@
 */
 
 #include "RouteModel.h"
+
 #include <iostream>
 
 namespace rideshare {

diff --git a/src/RouteModel.h → src/mapping/RouteModel.h b/src/RouteModel.h → src/mapping/RouteModel.h
diff --git a/src/RoutePlanner.cpp → src/routing/RoutePlanner.cpp b/src/RoutePlanner.cpp → src/routing/RoutePlanner.cpp
@@ -4,11 +4,12 @@
 */
 
 #include "RoutePlanner.h"
+
 #include <algorithm>
 #include <mutex>
 
-#include "RouteModel.h"
-#include "MapObject.h"
+#include "mapping/RouteModel.h"
+#include "map_object/MapObject.h"
 
 namespace rideshare {
 

diff --git a/src/RoutePlanner.h → src/routing/RoutePlanner.h b/src/RoutePlanner.h → src/routing/RoutePlanner.h
@@ -5,8 +5,9 @@
 #include <mutex>
 #include <vector>
 #include <string>
-#include "RouteModel.h"
-#include "MapObject.h"
+
+#include "mapping/RouteModel.h"
+#include "map_object/MapObject.h"
 
 namespace rideshare {
 

diff --git a/src/Graphics.cpp → src/visual/Graphics.cpp b/src/Graphics.cpp → src/visual/Graphics.cpp
@@ -6,7 +6,7 @@
 #include <opencv2/imgproc.hpp>
 #include <opencv2/highgui.hpp>
 
-#include "Coordinate.h"
+#include "mapping/Coordinate.h"
 
 namespace rideshare {
 

diff --git a/src/Graphics.h → src/visual/Graphics.h b/src/Graphics.h → src/visual/Graphics.h
@@ -5,9 +5,9 @@
 #include <vector>
 #include <opencv2/core.hpp>
 
-#include "Passenger.h"
-#include "PassengerQueue.h"
-#include "VehicleManager.h"
+#include "concurrent/PassengerQueue.h"
+#include "concurrent/VehicleManager.h"
+#include "map_object/Passenger.h"
 
 namespace rideshare {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     */
     #include "RouteModel.h"
     #include <iostream>
     namespace rideshare {
@@ Expand Down @@