Move Trace.hpp file to utils directory

src/common/CMakeLists.txt

@@ -11,9 +11,10 @@ LINK_DIRECTORIES(
   ${Boost_LIBRARY_DIRS})
 
 SET(COMMON_HPP Bag.hpp ExternalEvent.hpp InternalEvent.hpp Links.hpp Node.hpp
-  Parameters.hpp RootCoordinator.hpp Scheduler.hpp Trace.hpp)
+  Parameters.hpp RootCoordinator.hpp)
 
 INSTALL(FILES ${COMMON_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/common)
 
 ADD_SUBDIRECTORY(scheduler)
-ADD_SUBDIRECTORY(time)
+ADD_SUBDIRECTORY(time)
+ADD_SUBDIRECTORY(utils)

src/common/utils/CMakeLists.txt

@@ -0,0 +1,16 @@
+INCLUDE_DIRECTORIES(
+  ${PARADEVS_BINARY_DIR}/src
+  ${PARADEVS_SOURCE_DIR}/src
+  ${Boost_INCLUDE_DIRS}
+  ${GLIBMM_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS})
+
+LINK_DIRECTORIES(
+  ${GLIBMM_LIBRARY_DIRS}
+  ${LIBXML_LIBRARY_DIR}
+  ${Boost_LIBRARY_DIRS})
+
+SET(COMMON_UTILS_HPP Trace.hpp)
+
+INSTALL(FILES ${COMMON_UTILS_HPP} DESTINATION
+  ${PARADEVS_INCLUDE_DIRS}/common/utils)

src/dtss/Coordinator.hpp

@@ -29,7 +29,7 @@
 
 #include <common/Coordinator.hpp>
 #include <common/Parameters.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>

src/dtss/Simulator.hpp

@@ -30,7 +30,7 @@
 #include <common/Coordinator.hpp>
 #include <common/Parameters.hpp>
 #include <common/Simulator.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <cassert>
 

src/pdevs/Coordinator.hpp

@@ -29,7 +29,7 @@
 
 #include <common/Coordinator.hpp>
 #include <common/Parameters.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>

src/pdevs/Simulator.hpp

@@ -30,7 +30,7 @@
 #include <common/Coordinator.hpp>
 #include <common/Parameters.hpp>
 #include <common/Simulator.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <cassert>
 

src/tests/dtss/models.hpp

@@ -28,6 +28,7 @@
 #define TESTS_DTSS_MODELS_HPP 1
 
 #include <dtss/Dynamics.hpp>
+
 #include <common/time/DoubleTime.hpp>
 
 namespace paradevs { namespace tests { namespace dtss {

src/tests/mixed/graph_manager.hpp

@@ -29,7 +29,6 @@
 
 #include <common/scheduler/VectorScheduler.hpp>
 #include <common/scheduler/HeapScheduler.hpp>
-#include <common/Trace.hpp>
 
 #include <dtss/Coordinator.hpp>
 #include <dtss/GraphManager.hpp>

src/tests/mixed/models.hpp

@@ -28,7 +28,7 @@
 #define TESTS_MIXED_MODELS_HPP 1
 
 #include <common/time/DoubleTime.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <dtss/Dynamics.hpp>
 

src/tests/pdevs/graph_manager.hpp

@@ -30,7 +30,6 @@
 #include <tests/pdevs/models.hpp>
 
 #include <common/scheduler/HeapScheduler.hpp>
-#include <common/Trace.hpp>
 
 #include <pdevs/Coordinator.hpp>
 #include <pdevs/GraphManager.hpp>

src/tests/pdevs/models.hpp

@@ -28,7 +28,7 @@
 #define TESTS_PDEVS_MODELS_HPP 1
 
 #include <common/time/DoubleTime.hpp>
-#include <common/Trace.hpp>
+#include <common/utils/Trace.hpp>
 
 #include <pdevs/Dynamics.hpp>