Create kernel directory with pdevs and dtss

src/CMakeLists.txt

@@ -7,6 +7,5 @@ ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
 
 ADD_SUBDIRECTORY(apps)
 ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(dtss)
-ADD_SUBDIRECTORY(pdevs)
+ADD_SUBDIRECTORY(kernel)
 ADD_SUBDIRECTORY(tests)

src/apps/main.cpp

@@ -30,7 +30,7 @@
 #include <common/scheduler/VectorScheduler.hpp>
 #include <common/scheduler/HeapScheduler.hpp>
 
-#include <pdevs/Coordinator.hpp>
+#include <kernel/pdevs/Coordinator.hpp>
 
 #include <tests/mixed/models.hpp>
 #include <tests/mixed/graph_manager.hpp>

src/kernel/CMakeLists.txt

@@ -0,0 +1,2 @@
+ADD_SUBDIRECTORY(dtss)
+ADD_SUBDIRECTORY(pdevs)

src/dtss/Coordinator.hpp

@@ -1,5 +1,5 @@
 /**
- * @file dtss/Coordinator.hpp
+ * @file kernel/dtss/Coordinator.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/dtss/GraphManager.hpp

@@ -1,5 +1,5 @@
 /**
- * @file dtss/GraphManager.hpp
+ * @file kernel/dtss/GraphManager.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/dtss/Simulator.hpp

@@ -1,5 +1,5 @@
 /**
- * @file dtss/Simulator.hpp
+ * @file kernel/dtss/Simulator.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/pdevs/Coordinator.hpp

@@ -1,5 +1,5 @@
 /**
- * @file pdevs/Coordinator.hpp
+ * @file kernel/pdevs/Coordinator.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/pdevs/GraphManager.hpp

@@ -1,5 +1,5 @@
 /**
- * @file pdevs/GraphManager.hpp
+ * @file kernel/pdevs/GraphManager.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/pdevs/Simulator.hpp

@@ -1,5 +1,5 @@
 /**
- * @file pdevs/Simulator.hpp
+ * @file kernel/pdevs/Simulator.hpp
  * @author The PARADEVS Development Team
  * See the AUTHORS or Authors.txt file
  */

src/tests/boost_graph/graph_manager.hpp

@@ -30,9 +30,9 @@
 #include <common/scheduler/HeapScheduler.hpp>
 #include <common/scheduler/VectorScheduler.hpp>
 
-#include <pdevs/Coordinator.hpp>
-#include <pdevs/GraphManager.hpp>
-#include <pdevs/Simulator.hpp>
+#include <kernel/pdevs/Coordinator.hpp>
+#include <kernel/pdevs/GraphManager.hpp>
+#include <kernel/pdevs/Simulator.hpp>
 
 #include <tests/boost_graph/models.hpp>
 #include <tests/boost_graph/graph_builder.hpp>

src/tests/boost_graph/models.hpp

@@ -24,12 +24,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __TESTS_BOOST_GRAPH_MODELS_HPP
-#define __TESTS_BOOST_GRAPH_MODELS_HPP 1
+#ifndef TESTS_BOOST_GRAPH_MODELS_HPP
+#define TESTS_BOOST_GRAPH_MODELS_HPP 1
 
 #include <common/time/DoubleTime.hpp>
 
-#include <pdevs/Dynamics.hpp>
+#include <kernel/pdevs/Dynamics.hpp>
 
 namespace paradevs { namespace tests { namespace boost_graph {
 

src/tests/dtss/graph_manager.hpp

@@ -27,9 +27,9 @@
 #ifndef TESTS_DTSS_GRAPH_MANAGER_HPP
 #define TESTS_DTSS_GRAPH_MANAGER_HPP 1
 
-#include <dtss/Coordinator.hpp>
-#include <dtss/GraphManager.hpp>
-#include <dtss/Simulator.hpp>
+#include <kernel/dtss/Coordinator.hpp>
+#include <kernel/dtss/GraphManager.hpp>
+#include <kernel/dtss/Simulator.hpp>
 
 #include <tests/dtss/models.hpp>
 

src/tests/dtss/models.hpp

@@ -27,7 +27,7 @@
 #ifndef TESTS_DTSS_MODELS_HPP
 #define TESTS_DTSS_MODELS_HPP 1
 
-#include <dtss/Dynamics.hpp>
+#include <kernel/dtss/Dynamics.hpp>
 
 #include <common/time/DoubleTime.hpp>
 

src/tests/mixed/graph_manager.hpp

@@ -30,13 +30,13 @@
 #include <common/scheduler/VectorScheduler.hpp>
 #include <common/scheduler/HeapScheduler.hpp>
 
-#include <dtss/Coordinator.hpp>
-#include <dtss/GraphManager.hpp>
-#include <dtss/Simulator.hpp>
+#include <kernel/dtss/Coordinator.hpp>
+#include <kernel/dtss/GraphManager.hpp>
+#include <kernel/dtss/Simulator.hpp>
 
-#include <pdevs/Coordinator.hpp>
-#include <pdevs/GraphManager.hpp>
-#include <pdevs/Simulator.hpp>
+#include <kernel/pdevs/Coordinator.hpp>
+#include <kernel/pdevs/GraphManager.hpp>
+#include <kernel/pdevs/Simulator.hpp>
 
 #include <tests/mixed/models.hpp>
 

src/tests/mixed/models.hpp

@@ -30,9 +30,9 @@
 #include <common/time/DoubleTime.hpp>
 #include <common/utils/Trace.hpp>
 
-#include <dtss/Dynamics.hpp>
+#include <kernel/dtss/Dynamics.hpp>
 
-#include <pdevs/Dynamics.hpp>
+#include <kernel/pdevs/Dynamics.hpp>
 
 namespace paradevs { namespace tests { namespace mixed {
 

src/tests/pdevs/graph_manager.hpp

@@ -31,9 +31,9 @@
 
 #include <common/scheduler/HeapScheduler.hpp>
 
-#include <pdevs/Coordinator.hpp>
-#include <pdevs/GraphManager.hpp>
-#include <pdevs/Simulator.hpp>
+#include <kernel/pdevs/Coordinator.hpp>
+#include <kernel/pdevs/GraphManager.hpp>
+#include <kernel/pdevs/Simulator.hpp>
 
 namespace paradevs { namespace tests { namespace pdevs {
 

src/tests/pdevs/models.hpp

@@ -30,7 +30,7 @@
 #include <common/time/DoubleTime.hpp>
 #include <common/utils/Trace.hpp>
 
-#include <pdevs/Dynamics.hpp>
+#include <kernel/pdevs/Dynamics.hpp>
 
 namespace paradevs { namespace tests { namespace pdevs {