Split headers folder in headers + sources

Grufoony · Grufoony · commit cfdbec8e3301 · 2025-01-24T15:49:07.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-file(GLOB SOURCES "src/dsm/headers/*.cpp" "src/dsm/utility/*.cpp")
+file(GLOB SOURCES "src/dsm/sources/*.cpp" "src/dsm/utility/*.cpp")
 
 add_library(dsm STATIC ${SOURCES})
 target_include_directories(dsm PUBLIC 
diff --git a/benchmark/Dynamics/CMakeLists.txt b/benchmark/Dynamics/CMakeLists.txt
@@ -14,7 +14,7 @@ set(EXECUTABLE_OUTPUT_PATH ../../)
 include_directories(../../src/dsm/headers)
 include_directories(../../src/dsm/utility/)
 
-file(GLOB SOURCES "../../src/dsm/headers/*.cpp")
+file(GLOB SOURCES "../../src/dsm/sources/*.cpp", "../../src/dsm/utility/*.cpp")
 
 # Compile
 add_executable(bench_dynamics.out BenchDynamics.cpp ${SOURCES})
diff --git a/benchmark/Graph/CMakeLists.txt b/benchmark/Graph/CMakeLists.txt
@@ -14,7 +14,7 @@ set(EXECUTABLE_OUTPUT_PATH ../../)
 include_directories(../../src/dsm/headers/)
 include_directories(../../src/dsm/utility/)
 
-file(GLOB SOURCES "../../src/dsm/headers/*.cpp")
+file(GLOB SOURCES "../../src/dsm/sources/*.cpp", "../../src/dsm/utility/*.cpp")
 
 # Compile
 add_executable(bench_graph.out BenchGraph.cpp ${SOURCES})
diff --git a/benchmark/Street/CMakeLists.txt b/benchmark/Street/CMakeLists.txt
@@ -14,7 +14,7 @@ set(EXECUTABLE_OUTPUT_PATH ../../)
 include_directories(../../src/dsm/headers)
 include_directories(../../src/dsm/utility/)
 
-file(GLOB SOURCES "../../src/dsm/headers/*.cpp")
+file(GLOB SOURCES "../../src/dsm/sources/*.cpp", "../../src/dsm/utility/*.cpp")
 
 # Compile
 add_executable(bench_street.out BenchStreet.cpp ${SOURCES})
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -19,7 +19,7 @@ set(EXECUTABLE_OUTPUT_PATH ../)
 
 # add as executable all cpp files into '.' folder
 file(GLOB SOURCES "*.cpp")
-file(GLOB SRC_SOURCES "../src/dsm/headers/*.cpp")
+file(GLOB SRC_SOURCES "../src/dsm/sources/*.cpp", "../src/dsm/utility/*.cpp")
 
 # Loop through each source file and create an executable
 foreach(SOURCE ${SOURCES})
diff --git a/profiling/CMakeLists.txt b/profiling/CMakeLists.txt
@@ -13,7 +13,7 @@ string(APPEND CMAKE_CXX_FLAGS "-Wall -Wextra -Os")
 # Set the folder for the executable
 set(EXECUTABLE_OUTPUT_PATH ../)
 
-file(GLOB SOURCES "../src/dsm/headers/*.cpp")
+file(GLOB SOURCES "../src/dsm/sources/*.cpp" "../src/dsm/utility/*.cpp")
 
 # Define the executable
 add_executable(prof.out main.cpp ${SOURCES})
diff --git a/src/dsm/sources/DijkstraWeights.cpp b/src/dsm/sources/DijkstraWeights.cpp
@@ -1,6 +1,6 @@
 
-#include "DijkstraWeights.hpp"
-#include "Graph.hpp"
+#include "../headers/DijkstraWeights.hpp"
+#include "../headers/Graph.hpp"
 
 namespace dsm {
 
diff --git a/src/dsm/sources/Edge.cpp b/src/dsm/sources/Edge.cpp
@@ -1,5 +1,5 @@
-#include "Edge.hpp"
-#include "../utility/Logger.hpp"
+#include "../headers/Edge.hpp"
+#include "../headers/../utility/Logger.hpp"
 
 #include <cassert>
 #include <cmath>
diff --git a/src/dsm/sources/FirstOrderDynamics.cpp b/src/dsm/sources/FirstOrderDynamics.cpp
@@ -1,4 +1,4 @@
-#include "FirstOrderDynamics.hpp"
+#include "../headers/FirstOrderDynamics.hpp"
 
 namespace dsm {
   FirstOrderDynamics::FirstOrderDynamics(Graph& graph,
diff --git a/src/dsm/sources/Graph.cpp b/src/dsm/sources/Graph.cpp
@@ -1,5 +1,5 @@
 
-#include "Graph.hpp"
+#include "../headers/Graph.hpp"
 
 namespace dsm {
   Graph::Graph()
diff --git a/src/dsm/sources/Intersection.cpp b/src/dsm/sources/Intersection.cpp
@@ -1,4 +1,4 @@
-#include "Intersection.hpp"
+#include "../headers/Intersection.hpp"
 
 #include <algorithm>
 #include <format>
diff --git a/src/dsm/sources/Itinerary.cpp b/src/dsm/sources/Itinerary.cpp
@@ -1,5 +1,5 @@
 
-#include "Itinerary.hpp"
+#include "../headers/Itinerary.hpp"
 
 namespace dsm {
   Itinerary::Itinerary(Id id, Id destination) : m_id{id}, m_destination{destination} {}
diff --git a/src/dsm/sources/Road.cpp b/src/dsm/sources/Road.cpp
@@ -1,5 +1,5 @@
-#include "Road.hpp"
-#include "../utility/Logger.hpp"
+#include "../headers/Road.hpp"
+#include "../headers/../utility/Logger.hpp"
 
 #include <cmath>
 #include <format>
diff --git a/src/dsm/sources/Roundabout.cpp b/src/dsm/sources/Roundabout.cpp
@@ -1,4 +1,4 @@
-#include "Roundabout.hpp"
+#include "../headers/Roundabout.hpp"
 
 #include <format>
 #include <stdexcept>
diff --git a/src/dsm/sources/Sensors.cpp b/src/dsm/sources/Sensors.cpp
@@ -1,4 +1,4 @@
-#include "Sensors.hpp"
+#include "../headers/Sensors.hpp"
 
 namespace dsm {
   void Counter::increaseInputCounter() { m_counters.first++; }
diff --git a/src/dsm/sources/Station.cpp b/src/dsm/sources/Station.cpp
@@ -1,4 +1,4 @@
-#include "Station.hpp"
+#include "../headers/Station.hpp"
 
 namespace dsm {
   Station::Station(Id id, Delay managementTime)
diff --git a/src/dsm/sources/Street.cpp b/src/dsm/sources/Street.cpp
@@ -1,5 +1,5 @@
 
-#include "Street.hpp"
+#include "../headers/Street.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/dsm/sources/TrafficLight.cpp b/src/dsm/sources/TrafficLight.cpp
@@ -1,4 +1,4 @@
-#include "TrafficLight.hpp"
+#include "../headers/TrafficLight.hpp"
 
 #include <format>
 #include <numeric>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 
 # add as executable all cpp files into '.' folder
 file(GLOB TEST_SOURCES "*.cpp")
-file(GLOB SRC_SOURCES "../src/dsm/headers/*.cpp")
+file(GLOB SRC_SOURCES "../src/dsm/sources/*.cpp", "../src/dsm/utility/*.cpp")
 list(APPEND SOURCES ${TEST_SOURCES} ${SRC_SOURCES})
 
 # Define the executable

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "FirstOrderDynamics.hpp"`
	`1`	`+#include "../headers/FirstOrderDynamics.hpp"`
`2`	`2`
`3`	`3`	`namespace dsm {`
`4`	`4`	`FirstOrderDynamics::FirstOrderDynamics(Graph& graph,`