Change project name

AUTHORS

@@ -1,4 +1,4 @@
-                 PARADEVS development team
+                 ARTIS development team
                  =========================
 
 

CMakeLists.txt

@@ -1,41 +1,41 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(PARADEVS CXX C)
+PROJECT(ARTIS CXX C)
 ENABLE_TESTING()
 
-SET(PARADEVS_MAJOR 1)
-SET(PARADEVS_MINOR 0)
-SET(PARADEVS_PATCH 0)
-SET(PARADEVS_EXTRA "")
-SET(PARADEVS_VERSION "${PARADEVS_MAJOR}.${PARADEVS_MINOR}.${PARADEVS_PATCH}")
-SET(PARADEVS_VERSION_SHORT "${PARADEVS_MAJOR}.${PARADEVS_MINOR}")
-SET(PARADEVS_NAME "paradevs")
-SET(PARADEVS_NAME_VERSION "${PARADEVS_NAME}-${PARADEVS_VERSION}")
-SET(PARADEVS_LOCALE_NAME "${PARADEVS_NAME}-${PARADEVS_MAJOR}-${PARADEVS_MINOR}")
-IF ("${PARADEVS_EXTRA}" STREQUAL "")
-  SET(PARADEVS_COMPLETE "${PARADEVS_MAJOR}.${PARADEVS_MINOR}.${PARADEVS_PATCH}")
-ELSE ("${PARADEVS_EXTRA}" STREQUAL "")
-  SET(PARADEVS_COMPLETE "${PARADEVS_MAJOR}.${PARADEVS_MINOR}.${PARADEVS_PATCH}-${PARADEVS_EXTRA}")
-ENDIF ("${PARADEVS_EXTRA}" STREQUAL "")
-SET(PARADEVS_NAME_COMPLETE "${PARADEVS_NAME}-${PARADEVS_COMPLETE}")
+SET(ARTIS_MAJOR 1)
+SET(ARTIS_MINOR 0)
+SET(ARTIS_PATCH 0)
+SET(ARTIS_EXTRA "")
+SET(ARTIS_VERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}")
+SET(ARTIS_VERSION_SHORT "${ARTIS_MAJOR}.${ARTIS_MINOR}")
+SET(ARTIS_NAME "artis-star")
+SET(ARTIS_NAME_VERSION "${ARTIS_NAME}-${ARTIS_VERSION}")
+SET(ARTIS_LOCALE_NAME "${ARTIS_NAME}-${ARTIS_MAJOR}-${ARTIS_MINOR}")
+IF ("${ARTIS_EXTRA}" STREQUAL "")
+  SET(ARTIS_COMPLETE "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}")
+ELSE ("${ARTIS_EXTRA}" STREQUAL "")
+  SET(ARTIS_COMPLETE "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}-${ARTIS_EXTRA}")
+ENDIF ("${ARTIS_EXTRA}" STREQUAL "")
+SET(ARTIS_NAME_COMPLETE "${ARTIS_NAME}-${ARTIS_COMPLETE}")
 
 #
  # Installation variables
 #
 
-SET(PARADEVS_LIBRARY_DIRS "lib/paradevs-${PARADEVS_VERSION_SHORT}")
-SET(PARADEVS_INCLUDE_DIRS "include/paradevs-${PARADEVS_VERSION_SHORT}/paradevs")
-SET(PARADEVS_INCLUDE_DIR "include/paradevs-${PARADEVS_VERSION_SHORT}")
-SET(PARADEVS_MANPAGE_PATH "share/man/man1")
-SET(PARADEVS_SHARE_DIRS "share/paradevs-${PARADEVS_VERSION_SHORT}")
+SET(ARTIS_LIBRARY_DIRS "lib/artis-star-${ARTIS_VERSION_SHORT}")
+SET(ARTIS_INCLUDE_DIRS "include/artis-star-${ARTIS_VERSION_SHORT}/artis-star")
+SET(ARTIS_INCLUDE_DIR "include/artis-star-${ARTIS_VERSION_SHORT}")
+SET(ARTIS_MANPAGE_PATH "share/man/man1")
+SET(ARTIS_SHARE_DIRS "share/artis-star-${ARTIS_VERSION_SHORT}")
 
 #
  # Append the library version information to the library target
  # properties.
 #
 
-SET (PARADEVS_LIBRARY_PROPERTIES VERSION 0)
-SET (PARADEVS_APP_PROPERTIES SOVERSION "${PARADEVS_MAJOR}.${PARADEVS_MINOR}"
-  VERSION "${PARADEVS_MAJOR}.${PARADEVS_MINOR}")
+SET (ARTIS_LIBRARY_PROPERTIES VERSION 0)
+SET (ARTIS_APP_PROPERTIES SOVERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}"
+  VERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}")
 
 #
  # CPack configuration
@@ -92,19 +92,19 @@ IF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "35")
   SET(Boost_SYSTEM_LIBRARY "")
 ENDIF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "35")
 IF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
-  SET(PARADEVS_HAVE_BOOST_SPIRIT2 0 CACHE INTERNAL "" FORCE)
+  SET(ARTIS_HAVE_BOOST_SPIRIT2 0 CACHE INTERNAL "" FORCE)
 ELSE (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
-  SET(PARADEVS_HAVE_BOOST_SPIRIT2 1 CACHE INTERNAL "" FORCE)
+  SET(ARTIS_HAVE_BOOST_SPIRIT2 1 CACHE INTERNAL "" FORCE)
 ENDIF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
 
 #
  # Generate the config.h
 #
 
-CHECK_INCLUDE_FILE_CXX(cxxabi.h PARADEVS_HAVE_GCC_ABI_DEMANGLE)
-CHECK_INCLUDE_FILE_CXX(execinfo.h PARADEVS_HAVE_EXECINFO)
-CHECK_INCLUDE_FILE_CXX(signal.h PARADEVS_HAVE_SIGNAL)
-INCLUDE_DIRECTORIES(${PARADEVS_BINARY_DIR})
+CHECK_INCLUDE_FILE_CXX(cxxabi.h ARTIS_HAVE_GCC_ABI_DEMANGLE)
+CHECK_INCLUDE_FILE_CXX(execinfo.h ARTIS_HAVE_EXECINFO)
+CHECK_INCLUDE_FILE_CXX(signal.h ARTIS_HAVE_SIGNAL)
+INCLUDE_DIRECTORIES(${ARTIS_BINARY_DIR})
 
 #
  # Generate the vle.pc pkg-config file.
@@ -113,13 +113,13 @@ INCLUDE_DIRECTORIES(${PARADEVS_BINARY_DIR})
  # cflag=-Iboost_1_34_1 for the directory
 #
 
-SET(PARADEVS_PKGCONFIG_PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
-SET(PARADEVS_PKGCONFIG_BOOSTINCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
-SET(PARADEVS_PKGCONFIG_LIBDIR "lib")
+SET(ARTIS_PKGCONFIG_PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
+SET(ARTIS_PKGCONFIG_BOOSTINCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
+SET(ARTIS_PKGCONFIG_LIBDIR "lib")
 
-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/paradevs.pc.in
-  ${PARADEVS_BINARY_DIR}/paradevs-${PARADEVS_VERSION_SHORT}.pc @ONLY)
-INSTALL(FILES ${PARADEVS_BINARY_DIR}/paradevs-${PARADEVS_VERSION_SHORT}.pc
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/artis-star.pc.in
+  ${ARTIS_BINARY_DIR}/artis-star-${ARTIS_VERSION_SHORT}.pc @ONLY)
+INSTALL(FILES ${ARTIS_BINARY_DIR}/artis-star-${ARTIS_VERSION_SHORT}.pc
   DESTINATION lib/pkgconfig)
 
 #
@@ -127,11 +127,11 @@ INSTALL(FILES ${PARADEVS_BINARY_DIR}/paradevs-${PARADEVS_VERSION_SHORT}.pc
 #
 
 IF(UNIX)
-  INSTALL(FILES "README" DESTINATION "${PARADEVS_SHARE_DIRS}")
-  INSTALL(FILES "COPYING" DESTINATION "${PARADEVS_SHARE_DIRS}")
+  INSTALL(FILES "README" DESTINATION "${ARTIS_SHARE_DIRS}")
+  INSTALL(FILES "COPYING" DESTINATION "${ARTIS_SHARE_DIRS}")
 ELSE(UNIX)
-  INSTALL(FILES "README" DESTINATION "${PARADEVS_SHARE_DIRS}" RENAME "Readme.txt")
-  INSTALL(FILES "COPYING" DESTINATION "${PARADEVS_SHARE_DIRS}" RENAME "CopyRight.txt")
+  INSTALL(FILES "README" DESTINATION "${ARTIS_SHARE_DIRS}" RENAME "Readme.txt")
+  INSTALL(FILES "COPYING" DESTINATION "${ARTIS_SHARE_DIRS}" RENAME "CopyRight.txt")
 ENDIF(UNIX)
 
 #
@@ -145,15 +145,15 @@ ADD_SUBDIRECTORY(src)
 #
 
 MESSAGE(STATUS "- - - -")
-MESSAGE(STATUS "${PARADEVS_NAME_COMPLETE} configured successfully")
+MESSAGE(STATUS "${ARTIS_NAME_COMPLETE} configured successfully")
 MESSAGE(STATUS "Using ${CMAKE_INSTALL_PREFIX} for installation")
 MESSAGE(STATUS "Build type ${CMAKE_BUILD_TYPE}")
-IF (PARADEVS_HAVE_GCC_ABI_DEMANGLE)
+IF (ARTIS_HAVE_GCC_ABI_DEMANGLE)
   MESSAGE(STATUS "Build with GCC ABI Demangle...: yes")
-ENDIF (PARADEVS_HAVE_GCC_ABI_DEMANGLE)
-IF (PARADEVS_HAVE_EXECINFO)
+ENDIF (ARTIS_HAVE_GCC_ABI_DEMANGLE)
+IF (ARTIS_HAVE_EXECINFO)
   MESSAGE(STATUS "Build with execinfo.h.........: yes")
-ENDIF (PARADEVS_HAVE_EXECINFO)
+ENDIF (ARTIS_HAVE_EXECINFO)
 IF (Boost_FOUND)
   MESSAGE(STATUS "Build with boost..............: yes")
 ENDIF (Boost_FOUND)

README

@@ -1,9 +1,9 @@
-Paradevs : DEVS multimodeling and simulation framework
-======================================================
+Artis-star: DEVS multimodeling and simulation framework
+=======================================================
 
 See AUTHORS and COPYRIGHT for the list of contributors.
 
-PARADEVS is a framework for multimodeling and simulation of complex dynamical
+ARTIS-star is a framework for multimodeling and simulation of complex dynamical
 systems. It addresses the reliability issue by using recent
 developments in the theory of modeling and simulation proposed by B. Zeigler
 with the Discrete Event System Specification formalism (DEVS).
@@ -26,7 +26,7 @@ Getting the code
 
 The source tree is currently hosted on GitHub. To view the repository
 online :
-    https://github.com//vle-labs/paradevs
+    https://gogs.univ-littoral.fr/devs-lab/artis-star
 
 The URL to clone it:
-    git@github.com:vle-labs/paradevs.git
+    https://gogs.univ-littoral.fr/devs-lab/artis-star.git

src/CMakeLists.txt

@@ -6,4 +6,4 @@ ELSE ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 
 ADD_SUBDIRECTORY(apps)
-ADD_SUBDIRECTORY(paradevs)
+ADD_SUBDIRECTORY(artis-star)

src/apps/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -10,11 +10,11 @@ LINK_DIRECTORIES(
   ${LIBXML_LIBRARY_DIRS}
   ${Boost_LIBRARY_DIRS})
 
-ADD_EXECUTABLE(paradevs main.cpp ${MIXED_TESTS_HPP})
-SET_TARGET_PROPERTIES(paradevs PROPERTIES ${PARADEVS_APP_PROPERTIES})
+ADD_EXECUTABLE(artis-star main.cpp ${MIXED_TESTS_HPP})
+SET_TARGET_PROPERTIES(artis-star PROPERTIES ${ARTIS_APP_PROPERTIES})
 
-TARGET_LINK_LIBRARIES(paradevs
+TARGET_LINK_LIBRARIES(artis-star
   ${Boost_SYSTEM_LIBRARY}
   ${Boost_TIMER_LIBRARY})
 
-INSTALL(TARGETS paradevs DESTINATION bin)
+INSTALL(TARGETS artis-star DESTINATION bin)

src/apps/main.cpp

@@ -1,12 +1,12 @@
 /**
  * @file app/main.cpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -24,14 +24,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <paradevs/common/Value.hpp>
+#include <artis-star/common/Value.hpp>
 
 int main()
 {
-    paradevs::common::Value v1;
-    paradevs::common::Value v2(10);
-    paradevs::common::Value v3(v2);
-    paradevs::common::Value v4(v1);
+    artis::common::Value v1;
+    artis::common::Value v2(10);
+    artis::common::Value v3(v2);
+    artis::common::Value v4(v1);
 
     v1 = v2;
     return 0;

src/artis-star.pc.in

@@ -0,0 +1,12 @@
+prefix=@ARTIS_PKGCONFIG_PREFIXPATH@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@ARTIS_PKGCONFIG_LIBDIR@
+includedir=${prefix}/include
+
+Name: vle
+Description: ARTIS multimodelling and Simulation tools
+Requires: libxml-2.0 glibmm-2.4
+Version: @ARTIS_VERSION@
+Libs:	-L${libdir} \
+    -lpdevs-@ARTIS_VERSION_SHORT@
+Cflags: -I${includedir}/artis-star-@ARTIS_VERSION_SHORT@ -I@ARTIS_PKGCONFIG_BOOSTINCLUDE_DIRS@

src/paradevs/common/Bag.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Bag.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,7 +27,7 @@
 #ifndef COMMON_BAG
 #define COMMON_BAG 1
 
-#include <paradevs/common/ExternalEvent.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
 
 #include <boost/serialization/vector.hpp>
 
@@ -35,7 +35,7 @@
 #include <string>
 #include <vector>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class ExternalEvent;
@@ -86,6 +86,6 @@ private:
     BOOST_SERIALIZATION_SPLIT_MEMBER()
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -13,7 +13,7 @@ SET(COMMON_HPP Bag.hpp Coordinator.hpp ExternalEvent.hpp
   GraphManager.hpp InternalEvent.hpp Links.hpp Model.hpp Node.hpp Parameters.hpp
   RootCoordinator.hpp Scheduler.hpp Simulator.hpp Value.hpp)
 
-INSTALL(FILES ${COMMON_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/common)
+INSTALL(FILES ${COMMON_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/common)
 
 ADD_SUBDIRECTORY(observer)
 ADD_SUBDIRECTORY(scheduler)

src/paradevs/common/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,15 +27,15 @@
 #ifndef COMMON_COORDINATOR
 #define COMMON_COORDINATOR
 
-#include <paradevs/common/Bag.hpp>
-#include <paradevs/common/ExternalEvent.hpp>
-#include <paradevs/common/Links.hpp>
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/Node.hpp>
+#include <artis-star/common/Bag.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
+#include <artis-star/common/Links.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/Node.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Model;
@@ -124,6 +124,6 @@ public :
     virtual typename Time::type transition(const typename Time::type& t) =0;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/ExternalEvent.hpp

@@ -1,12 +1,12 @@
 /**
  * @file ExternalEvent.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,9 +27,9 @@
 #ifndef COMMON_EXTERNAL_EVENT
 #define COMMON_EXTERNAL_EVENT 1
 
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/Node.hpp>
-#include <paradevs/common/Value.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/Node.hpp>
+#include <artis-star/common/Value.hpp>
 
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/nvp.hpp>
@@ -38,7 +38,7 @@
 #include <string>
 #include <vector>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Node;
@@ -124,6 +124,6 @@ private:
     Value           _content;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/GraphManager.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/GraphManager.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,15 +27,15 @@
 #ifndef COMMON_GRAPH_MANANGER
 #define COMMON_GRAPH_MANANGER
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Links.hpp>
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/utils/String.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Links.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/utils/String.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class GraphManager
@@ -84,6 +84,6 @@ protected:
     common::Coordinator < Time >*  _coordinator;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/InternalEvent.hpp

@@ -1,12 +1,12 @@
 /**
  * @file InternalEvent.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef COMMON_INTERNAL_EVENT
 #define COMMON_INTERNAL_EVENT 1
 
-#include <paradevs/common/Model.hpp>
+#include <artis-star/common/Model.hpp>
 
 #include <functional>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Model;
@@ -89,6 +89,6 @@ struct EventCompare
     { return left >= right; }
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Links.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Links.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,13 +27,13 @@
 #ifndef COMMON_LINKS
 #define COMMON_LINKS 1
 
-#include <paradevs/common/Node.hpp>
-#include <paradevs/common/utils/String.hpp>
+#include <artis-star/common/Node.hpp>
+#include <artis-star/common/utils/String.hpp>
 
 #include <map>
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Node;
@@ -118,6 +118,6 @@ public:
     }
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Model.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Model.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef COMMON_MODEL
 #define COMMON_MODEL
 
-#include <paradevs/common/Bag.hpp>
-#include <paradevs/common/ExternalEvent.hpp>
-#include <paradevs/common/InternalEvent.hpp>
-#include <paradevs/common/Scheduler.hpp>
-#include <paradevs/common/Value.hpp>
+#include <artis-star/common/Bag.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
+#include <artis-star/common/InternalEvent.hpp>
+#include <artis-star/common/Scheduler.hpp>
+#include <artis-star/common/Value.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -39,7 +39,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class ExternalEvent;
@@ -287,6 +287,6 @@ public:
     }
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Node.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Node.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef COMMON_NODE
 #define COMMON_NODE 1
 
-#include <paradevs/common/Model.hpp>
+#include <artis-star/common/Model.hpp>
 
 #include <string>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Model;
@@ -81,6 +81,6 @@ private :
     int             _id;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Parameters.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/Parameters.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,7 +27,7 @@
 #ifndef COMMON_PARAMETERS
 #define COMMON_PARAMETERS 1
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 class NoParameters
 {
@@ -36,6 +36,6 @@ public:
     { }
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/RootCoordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file RootCoordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,14 +27,14 @@
 #ifndef COMMON_ROOT_COORDINATOR
 #define COMMON_ROOT_COORDINATOR
 
-#include <paradevs/common/observer/Observer.hpp>
-#include <paradevs/common/observer/View.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/observer/Observer.hpp>
+#include <artis-star/common/observer/View.hpp>
+#include <artis-star/common/Parameters.hpp>
 
 #include <sstream>
 #include <string>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time, class Coordinator >
 class RootCoordinator
@@ -100,6 +100,6 @@ private :
     typename Time::type         _tn;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Scheduler.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Scheduler.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,13 +27,13 @@
 #ifndef COMMON_SCHEDULER
 #define COMMON_SCHEDULER 1
 
-#include <paradevs/common/scheduler/HeapScheduler.hpp>
+#include <artis-star/common/scheduler/HeapScheduler.hpp>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 struct SchedulerHandle;
 
-typedef typename paradevs::common::scheduler::HeapScheduler <
+typedef typename artis::common::scheduler::HeapScheduler <
     common::DoubleTime, SchedulerHandle >::type SchedulerType;
 
 struct SchedulerHandle
@@ -54,6 +54,6 @@ struct SchedulerHandle
     SchedulerType::handle_type _handle;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Simulator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Simulator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef COMMON_SIMULATOR
 #define COMMON_SIMULATOR
 
-#include <paradevs/common/Model.hpp>
+#include <artis-star/common/Model.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Simulator : public virtual Model < Time >
@@ -63,6 +63,6 @@ public :
     virtual typename Time::type transition(const typename Time::type& t) =0;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/Value.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Value.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -36,7 +36,7 @@
 
 #include <iostream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 class Value
 {
@@ -165,6 +165,6 @@ private:
     size_t _type_id;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/observer/CMakeLists.txt

@@ -6,4 +6,4 @@ LINK_DIRECTORIES()
 SET(COMMON_OBSERVER_HPP Observer.hpp Output.hpp View.hpp)
 
 INSTALL(FILES ${COMMON_OBSERVER_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/common/observer)
+  ${ARTIS_INCLUDE_DIRS}/common/observer)

src/paradevs/common/observer/Observer.hpp

@@ -1,12 +1,12 @@
 /**
- * @file paradevs/common/observer/Observer.hpp
- * @author The PARADEVS Development Team
+ * @file artis-star/common/observer/Observer.hpp
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -24,15 +24,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARADEVS_OBSERVER_OBSERVER_HPP
-#define PARADEVS_OBSERVER_OBSERVER_HPP
+#ifndef ARTIS_OBSERVER_OBSERVER_HPP
+#define ARTIS_OBSERVER_OBSERVER_HPP
 
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/observer/View.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/observer/View.hpp>
 
 #include <vector>
 
-namespace paradevs { namespace observer {
+namespace artis { namespace observer {
 
 template < typename Time >
 class Observer

src/paradevs/common/observer/Output.hpp

@@ -1,5 +1,5 @@
 /**
- * @file paradevs/observer/Output.hpp
+ * @file artis-star/observer/Output.hpp
  * @author See the AUTHORS file
  */
 
@@ -20,16 +20,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARADEVS_COMMON_OBSERVER_OUTPUT_HPP
-#define PARADEVS_COMMON_OBSERVER_OUTPUT_HPP
+#ifndef ARTIS_COMMON_OBSERVER_OUTPUT_HPP
+#define ARTIS_COMMON_OBSERVER_OUTPUT_HPP
 
-#include <paradevs/common/observer/Observer.hpp>
-#include <paradevs/common/observer/View.hpp>
-#include <paradevs/utils/DateTime.hpp>
+#include <artis-star/common/observer/Observer.hpp>
+#include <artis-star/common/observer/View.hpp>
+#include <artis-star/utils/DateTime.hpp>
 
 #include <boost/format.hpp>
 
-namespace paradevs { namespace observer {
+namespace artis { namespace observer {
 
 template < typename Time >
 class Output

src/paradevs/common/observer/View.hpp

@@ -1,12 +1,12 @@
 /**
- * @file paradevs/common/observer/View.hpp
- * @author The PARADEVS Development Team
+ * @file artis-star/common/observer/View.hpp
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -24,17 +24,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARADEVS_COMMON_OBSERVER_VIEW_HPP
-#define PARADEVS_COMMON_OBSERVER_VIEW_HPP
+#ifndef ARTIS_COMMON_OBSERVER_VIEW_HPP
+#define ARTIS_COMMON_OBSERVER_VIEW_HPP
 
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/time/DoubleTime.hpp>
-#include <paradevs/common/Value.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/time/DoubleTime.hpp>
+#include <artis-star/common/Value.hpp>
 
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace paradevs { namespace observer {
+namespace artis { namespace observer {
 
 template < typename Time >
 class View
@@ -54,7 +54,7 @@ public:
     virtual ~View()
     { }
 
-    void attachModel(const paradevs::common::Model < Time >* m)
+    void attachModel(const artis::common::Model < Time >* m)
     { _model = m; }
 
     double begin() const
@@ -221,7 +221,7 @@ private:
 
     Selectors                               _selectors;
     SelectorValues                          _values;
-    const paradevs::common::Model < Time >* _model;
+    const artis::common::Model < Time >* _model;
 };
 
 } }

src/paradevs/common/scheduler/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -14,4 +14,4 @@ SET(COMMON_SCHEDULER_HPP HeapScheduler.hpp SchedulerHandle.hpp
   VectorScheduler.hpp)
 
 INSTALL(FILES ${COMMON_SCHEDULER_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/common/scheduler)
+  ${ARTIS_INCLUDE_DIRS}/common/scheduler)

src/paradevs/common/scheduler/HeapScheduler.hpp

@@ -1,12 +1,12 @@
 /**
  * @file HeapScheduler.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,13 +27,13 @@
 #ifndef COMMON_SCHEDULER_HEAP_SCHEDULER_HPP
 #define COMMON_SCHEDULER_HEAP_SCHEDULER_HPP 1
 
-#include <paradevs/common/InternalEvent.hpp>
+#include <artis-star/common/InternalEvent.hpp>
 
 #include <boost/heap/fibonacci_heap.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < class Time >
 class Model;
@@ -126,6 +126,6 @@ public:
     }
 };
 
-} } } // namespace paradevs common scheduler
+} } } // namespace artis common scheduler
 
 #endif

src/paradevs/common/scheduler/SchedulerHandle.hpp

@@ -1,12 +1,12 @@
 /**
  * @file SchedulerHandle.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,7 +27,7 @@
 #ifndef COMMON_SCHEDULER_SCHEDULER_HANDLE_HPP
 #define COMMON_SCHEDULER_SCHEDULER_HANDLE_HPP 1
 
-namespace paradevs { namespace common { namespace scheduler {
+namespace artis { namespace common { namespace scheduler {
 
 struct NoSchedulerHandle
 {
@@ -41,6 +41,6 @@ struct NoSchedulerHandle
     { }
 };
 
-} } } // namespace paradevs common scheduler
+} } } // namespace artis common scheduler
 
 #endif

src/paradevs/common/scheduler/VectorScheduler.hpp

@@ -1,12 +1,12 @@
 /**
  * @file VectorScheduler.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,13 +27,13 @@
 #ifndef COMMON_SCHEDULER_VECTOR_SCHEDULER_HPP
 #define COMMON_SCHEDULER_VECTOR_SCHEDULER_HPP 1
 
-#include <paradevs/common/InternalEvent.hpp>
-#include <paradevs/common/scheduler/SchedulerHandle.hpp>
+#include <artis-star/common/InternalEvent.hpp>
+#include <artis-star/common/scheduler/SchedulerHandle.hpp>
 
 #include <algorithm>
 #include <sstream>
 
-namespace paradevs { namespace common { namespace scheduler {
+namespace artis { namespace common { namespace scheduler {
 
 template < class Time >
 class VectorScheduler :
@@ -116,6 +116,6 @@ private:
     }
 };
 
-} } } // namespace paradevs common scheduler
+} } } // namespace artis common scheduler
 
 #endif

src/paradevs/common/time/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -9,4 +9,4 @@ LINK_DIRECTORIES(
 SET(COMMON_TIME_HPP DoubleTime.hpp Time.hpp)
 
 INSTALL(FILES ${COMMON_TIME_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/common/time)
+  ${ARTIS_INCLUDE_DIRS}/common/time)

src/paradevs/common/time/DoubleTime.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/time/DoubleTime.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef COMMON_TIME_DOUBLE_TIME
 #define COMMON_TIME_DOUBLE_TIME 1
 
-#include <paradevs/common/time/Time.hpp>
+#include <artis-star/common/time/Time.hpp>
 
 #include <limits>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < typename T >
 struct Limits
@@ -45,6 +45,6 @@ struct Limits
 
 typedef Time < double, Limits < double > > DoubleTime;
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/time/Time.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/time/Time.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,7 +27,7 @@
 #ifndef COMMON_TIME_TIME
 #define COMMON_TIME_TIME 1
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 template < typename Type, typename Limits >
 struct Time
@@ -38,6 +38,6 @@ struct Time
     typedef Type type;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 #endif

src/paradevs/common/utils/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -13,4 +13,4 @@ LINK_DIRECTORIES(
 SET(COMMON_UTILS_HPP Multithreading.hpp String.hpp Trace.hpp)
 
 INSTALL(FILES ${COMMON_UTILS_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/common/utils)
+  ${ARTIS_INCLUDE_DIRS}/common/utils)

src/paradevs/common/utils/Multithreading.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/utils/Multithreading.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -31,7 +31,7 @@
 #include <queue>
 #include <mutex>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 struct BaseMessage
 {
@@ -245,6 +245,6 @@ private:
     MessageQueue _queue;
 };
 
-} }  // namespace paradevs common
+} }  // namespace artis common
 
 #endif

src/paradevs/common/utils/String.hpp

@@ -1,12 +1,12 @@
 /**
  * @file common/utils/String.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -29,7 +29,7 @@
 
 #include <string>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 std::string spaces(unsigned int number)
 {
@@ -41,6 +41,6 @@ std::string spaces(unsigned int number)
     return str;
 }
 
-} }  // namespace paradevs common
+} }  // namespace artis common
 
 #endif

src/paradevs/common/utils/Trace.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Trace.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -35,7 +35,7 @@
 #include <string>
 #include <vector>
 
-namespace paradevs { namespace common {
+namespace artis { namespace common {
 
 enum TraceType { NONE = 0, I_MESSAGE, POST_EVENT, S_MESSAGE, Y_MESSAGE,
                  DELTA_INT, DELTA_EXT, DELTA_CONF, TA, LAMBDA, START, OUTPUT };
@@ -214,12 +214,12 @@ private:
     std::mutex             _mutex;
 };
 
-} } // namespace paradevs common
+} } // namespace artis common
 
 template < class Time >
-paradevs::common::Trace < Time >& operator<<(
-    paradevs::common::Trace < Time >& trace,
-    const paradevs::common::TraceElement < Time >& e)
+artis::common::Trace < Time >& operator<<(
+    artis::common::Trace < Time >& trace,
+    const artis::common::TraceElement < Time >& e)
 {
     std::lock_guard < std::mutex > lock(trace.mutex());
 
@@ -228,8 +228,8 @@ paradevs::common::Trace < Time >& operator<<(
 }
 
 template < class Time >
-paradevs::common::Trace < Time >& operator<<(
-    paradevs::common::Trace < Time >& trace,
+artis::common::Trace < Time >& operator<<(
+    artis::common::Trace < Time >& trace,
     const std::string& str)
 {
     std::lock_guard < std::mutex > lock(trace.mutex());
@@ -239,8 +239,8 @@ paradevs::common::Trace < Time >& operator<<(
 }
 
 template < class Time >
-paradevs::common::Trace < Time >& operator<<(
-    paradevs::common::Trace < Time >& trace,
+artis::common::Trace < Time >& operator<<(
+    artis::common::Trace < Time >& trace,
     typename Time::type t)
 {
     std::lock_guard < std::mutex > lock(trace.mutex());
@@ -250,10 +250,10 @@ paradevs::common::Trace < Time >& operator<<(
 }
 
 template < class Time >
-std::shared_ptr < paradevs::common::Trace < Time > >
-paradevs::common::Trace < Time >::_instance = nullptr;
+std::shared_ptr < artis::common::Trace < Time > >
+artis::common::Trace < Time >::_instance = nullptr;
 
 template < class Time >
-std::once_flag paradevs::common::Trace < Time >::_flag;
+std::once_flag artis::common::Trace < Time >::_flag;
 
 #endif

src/paradevs/kernel/dtss/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -11,4 +11,4 @@ LINK_DIRECTORIES(
 
 SET(DTSS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
-INSTALL(FILES ${DTSS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/kernel/dtss)
+INSTALL(FILES ${DTSS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/dtss)

src/paradevs/kernel/dtss/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/dtss/Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,14 +27,14 @@
 #ifndef DTSS_COORDINATOR
 #define DTSS_COORDINATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>
 
-namespace paradevs { namespace dtss {
+namespace artis { namespace dtss {
 
 template < class Time >
 class Parameters
@@ -233,6 +233,6 @@ private:
     Policy              _policy;
 };
 
-} } // namespace paradevs dtss
+} } // namespace artis dtss
 
 #endif

src/paradevs/kernel/dtss/Dynamics.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Dynamics.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef DTSS_DYNAMICS
 #define DTSS_DYNAMICS 1
 
-#include <paradevs/common/Bag.hpp>
-#include <paradevs/common/ExternalEvent.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/Bag.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
+#include <artis-star/common/Parameters.hpp>
 
-namespace paradevs { namespace dtss {
+namespace artis { namespace dtss {
 
 template < class Time,
            class Parameters = common::NoParameters >
@@ -66,6 +66,6 @@ private:
     std::string _name;
 };
 
-} } // namespace paradevs dtss
+} } // namespace artis dtss
 
 #endif

src/paradevs/kernel/dtss/GraphManager.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/dtss/GraphManager.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,13 +27,13 @@
 #ifndef DTSS_GRAPH_MANAGER
 #define DTSS_GRAPH_MANAGER
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/GraphManager.hpp>
-#include <paradevs/common/Links.hpp>
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/GraphManager.hpp>
+#include <artis-star/common/Links.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/Parameters.hpp>
 
-namespace paradevs { namespace dtss {
+namespace artis { namespace dtss {
 
 template < class Time,
            class GraphParameters = common::NoParameters >
@@ -116,6 +116,6 @@ private:
     common::Links < Time > _link_list;
 };
 
-} } // namespace paradevs dtss
+} } // namespace artis dtss
 
 #endif

src/paradevs/kernel/dtss/Simulator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/dtss/Simulator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,14 +27,14 @@
 #ifndef DTSS_SIMULATOR
 #define DTSS_SIMULATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/Simulator.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/Simulator.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
 #include <cassert>
 
-namespace paradevs { namespace dtss {
+namespace artis { namespace dtss {
 
 template < class Time, class Dynamics,
            class Parameters = common::NoParameters >
@@ -182,6 +182,6 @@ private :
     typename Time::type _time_step;
 };
 
-} } // namespace paradevs dtss
+} } // namespace artis dtss
 
 #endif

src/paradevs/kernel/pdevs/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -11,7 +11,7 @@ LINK_DIRECTORIES(
 
 SET(PDEVS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
-INSTALL(FILES ${PDEVS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/kernel/pdevs)
+INSTALL(FILES ${PDEVS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/pdevs)
 
 ADD_SUBDIRECTORY(multithreading)
 ADD_SUBDIRECTORY(mpi)

src/paradevs/kernel/pdevs/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,16 +27,16 @@
 #ifndef PDEVS_COORDINATOR
 #define PDEVS_COORDINATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/Scheduler.hpp>
-#include <paradevs/common/utils/String.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/Scheduler.hpp>
+#include <artis-star/common/utils/String.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>
 
-namespace paradevs { namespace pdevs {
+namespace artis { namespace pdevs {
 
 template < class Time,
            class GraphManager,
@@ -310,6 +310,6 @@ protected:
     common::SchedulerType _event_table;
 };
 
-} } // namespace paradevs pdevs
+} } // namespace artis pdevs
 
 #endif

src/paradevs/kernel/pdevs/Dynamics.hpp

@@ -1,12 +1,12 @@
 /**
  * @file Dynamics.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,14 +27,14 @@
 #ifndef PDEVS_DYNAMICS
 #define PDEVS_DYNAMICS
 
-#include <paradevs/common/Bag.hpp>
-#include <paradevs/common/ExternalEvent.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/Bag.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
+#include <artis-star/common/Parameters.hpp>
 
 #include <string>
 #include <vector>
 
-namespace paradevs { namespace pdevs {
+namespace artis { namespace pdevs {
 
 template < class Time,
            class Parameters = common::NoParameters >
@@ -82,6 +82,6 @@ private:
     std::string _name;
 };
 
-} } // namespace paradevs pdevs
+} } // namespace artis pdevs
 
 #endif

src/paradevs/kernel/pdevs/GraphManager.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/GraphManager.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,16 +27,16 @@
 #ifndef PDEVS_GRAPH_MANANGER
 #define PDEVS_GRAPH_MANANGER
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/GraphManager.hpp>
-#include <paradevs/common/Links.hpp>
-#include <paradevs/common/Model.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/utils/String.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/GraphManager.hpp>
+#include <artis-star/common/Links.hpp>
+#include <artis-star/common/Model.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/utils/String.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace pdevs {
+namespace artis { namespace pdevs {
 
 template < class Time,
            class GraphParameters = common::NoParameters >
@@ -151,6 +151,6 @@ private:
     common::Links < Time > _link_list;
 };
 
-} } // namespace paradevs pdevs
+} } // namespace artis pdevs
 
 #endif

src/paradevs/kernel/pdevs/Simulator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/Simulator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,15 +27,15 @@
 #ifndef PDEVS_SIMULATOR
 #define PDEVS_SIMULATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/Simulator.hpp>
-#include <paradevs/common/utils/String.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/Simulator.hpp>
+#include <artis-star/common/utils/String.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
 #include <cassert>
 
-namespace paradevs { namespace pdevs {
+namespace artis { namespace pdevs {
 
 template < class Time, class Dynamics,
            class Parameters = common::NoParameters >
@@ -218,6 +218,6 @@ private :
     Dynamics _dynamics;
 };
 
-} } // namespace paradevs pdevs
+} } // namespace artis pdevs
 
 #endif

src/paradevs/kernel/pdevs/mpi/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -13,4 +13,4 @@ SET(PDEVS_MPI_HPP Coordinator.hpp GraphManager.hpp LogicalProcessor.hpp
   ModelProxy.hpp)
 
 INSTALL(FILES ${PDEVS_MPI_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/kernel/pdevs/mpi)
+  ${ARTIS_INCLUDE_DIRS}/kernel/pdevs/mpi)

src/paradevs/kernel/pdevs/mpi/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/mpi/Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,10 +27,10 @@
 #ifndef PDEVS_MPI_COORDINATOR
 #define PDEVS_MPI_COORDINATOR 1
 
-#include <paradevs/kernel/pdevs/Coordinator.hpp>
-#include <paradevs/kernel/pdevs/mpi/LogicalProcessor.hpp>
+#include <artis-star/kernel/pdevs/Coordinator.hpp>
+#include <artis-star/kernel/pdevs/mpi/LogicalProcessor.hpp>
 
-namespace paradevs { namespace pdevs { namespace mpi {
+namespace artis { namespace pdevs { namespace mpi {
 
 template < class Time,
            class GraphManager,
@@ -64,6 +64,6 @@ public:
     { parent_type::_graph_manager.set_logical_processor(logical_processor); }
 };
 
-} } } // namespace paradevs pdevs mpi
+} } } // namespace artis pdevs mpi
 
 #endif

src/paradevs/kernel/pdevs/mpi/GraphManager.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/GraphManager.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,12 +27,12 @@
 #ifndef PDEVS_MPI_GRAPH_MANANGER
 #define PDEVS_MPI_GRAPH_MANANGER 1
 
-#include <paradevs/kernel/pdevs/mpi/Coordinator.hpp>
-#include <paradevs/kernel/pdevs/mpi/LogicalProcessor.hpp>
+#include <artis-star/kernel/pdevs/mpi/Coordinator.hpp>
+#include <artis-star/kernel/pdevs/mpi/LogicalProcessor.hpp>
 
 #include <sstream>
 
-namespace paradevs { namespace pdevs { namespace mpi {
+namespace artis { namespace pdevs { namespace mpi {
 
 template < class Time,
            class GraphParameters = common::NoParameters >
@@ -59,6 +59,6 @@ private:
     LogicalProcessor < Time >* _logical_processor;
 };
 
-} } } // namespace paradevs pdevs mpi
+} } } // namespace artis pdevs mpi
 
 #endif

src/paradevs/kernel/pdevs/mpi/LogicalProcessor.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/mpi/LogicalProcessor.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef PDEVS_MPI_LOGICAL_PROCESSOR
 #define PDEVS_MPI_LOGICAL_PROCESSOR 1
 
-#include <paradevs/kernel/pdevs/mpi/ModelProxy.hpp>
+#include <artis-star/kernel/pdevs/mpi/ModelProxy.hpp>
 
 #include <boost/mpi/communicator.hpp>
 
-namespace paradevs { namespace pdevs { namespace mpi {
+namespace artis { namespace pdevs { namespace mpi {
 
 template < class Time >
 class LogicalProcessor
@@ -110,6 +110,6 @@ private:
     common::Bag < Time >     _output_bag;
 };
 
-} } } // namespace paradevs pdevs mpi
+} } } // namespace artis pdevs mpi
 
 #endif

src/paradevs/kernel/pdevs/mpi/ModelProxy.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/mpi/ModelProxy.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,12 +27,12 @@
 #ifndef PDEVS_MPI_MODEL_PROXY
 #define PDEVS_MPI_MODEL_PROXY 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Model.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Model.hpp>
 
 #include <boost/mpi/communicator.hpp>
 
-namespace paradevs { namespace pdevs { namespace mpi {
+namespace artis { namespace pdevs { namespace mpi {
 
 enum Tags
 {
@@ -146,6 +146,6 @@ private:
     int _rank;
 };
 
-} } } // namespace paradevs pdevs mpi
+} } } // namespace artis pdevs mpi
 
 #endif

src/paradevs/kernel/pdevs/multithreading/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -12,4 +12,4 @@ LINK_DIRECTORIES(
 SET(PDEVS_MULTITHREADING_HPP Coordinator.hpp)
 
 INSTALL(FILES ${PDEVS_MULTITHREADING_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/kernel/pdevs/multithreading)
+  ${ARTIS_INCLUDE_DIRS}/kernel/pdevs/multithreading)

src/paradevs/kernel/pdevs/multithreading/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/pdevs/multithreading/Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,12 +27,12 @@
 #ifndef PDEVS_MULTITHREADING_COORDINATOR
 #define PDEVS_MULTITHREADING_COORDINATOR 1
 
-#include <paradevs/common/utils/Multithreading.hpp>
-#include <paradevs/kernel/pdevs/Coordinator.hpp>
+#include <artis-star/common/utils/Multithreading.hpp>
+#include <artis-star/kernel/pdevs/Coordinator.hpp>
 
 #include <thread>
 
-namespace paradevs { namespace pdevs { namespace multithreading {
+namespace artis { namespace pdevs { namespace multithreading {
 
 template < class Time>
 struct start_message
@@ -113,9 +113,9 @@ public:
     }
 
     void done()
-    { get_sender().send(paradevs::common::Close()); }
+    { get_sender().send(artis::common::Close()); }
 
-    paradevs::common::Sender get_sender()
+    artis::common::Sender get_sender()
     { return _incoming; }
 
     void set_sender(common::Sender sender)
@@ -160,7 +160,7 @@ public:
                         });
             }
         }
-        catch(paradevs::common::Close const&)
+        catch(artis::common::Close const&)
         { }
     }
 
@@ -226,12 +226,12 @@ public:
 
 private:
     std::thread*               _thread;
-    paradevs::common::Receiver _incoming;
-    paradevs::common::Sender   _sender;
+    artis::common::Receiver _incoming;
+    artis::common::Sender   _sender;
     unsigned int               _received;
     std::mutex                 _received_mutex;
 };
 
-} } } // namespace paradevs pdevs multithreading
+} } } // namespace artis pdevs multithreading
 
 #endif

src/paradevs/kernel/sss/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-  ${PARADEVS_BINARY_DIR}/src
-  ${PARADEVS_SOURCE_DIR}/src
+  ${ARTIS_BINARY_DIR}/src
+  ${ARTIS_SOURCE_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${GLIBMM_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS})
@@ -12,4 +12,4 @@ LINK_DIRECTORIES(
 SET(SSS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Model.hpp
   Simulator.hpp)
 
-INSTALL(FILES ${SSS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/kernel/sss)
+INSTALL(FILES ${SSS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/sss)

src/paradevs/kernel/sss/Coordinator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/sss/Coordinator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,16 +27,16 @@
 #ifndef SSS_COORDINATOR
 #define SSS_COORDINATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
-#include <paradevs/kernel/sss/Model.hpp>
+#include <artis-star/kernel/sss/Model.hpp>
 
 #include <cassert>
 #include <iostream>
 
-namespace paradevs { namespace sss {
+namespace artis { namespace sss {
 
 template < class Time >
 class Parameters
@@ -181,6 +181,6 @@ private:
     Policy              _policy;
 };
 
-} } // namespace paradevs sss
+} } // namespace artis sss
 
 #endif

src/paradevs/kernel/sss/Dynamics.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/sss/Dynamics.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,11 +27,11 @@
 #ifndef SSS_DYNAMICS
 #define SSS_DYNAMICS 1
 
-#include <paradevs/common/Bag.hpp>
-#include <paradevs/common/ExternalEvent.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/Bag.hpp>
+#include <artis-star/common/ExternalEvent.hpp>
+#include <artis-star/common/Parameters.hpp>
 
-namespace paradevs { namespace sss {
+namespace artis { namespace sss {
 
 template < class Time,
            class Parameters = common::NoParameters >
@@ -69,6 +69,6 @@ private:
     std::string _name;
 };
 
-} } // namespace paradevs sss
+} } // namespace artis sss
 
 #endif

src/paradevs/kernel/sss/GraphManager.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/sss/GraphManager.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,14 +27,14 @@
 #ifndef SSS_GRAPH_MANANGER
 #define SSS_GRAPH_MANANGER
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/GraphManager.hpp>
-#include <paradevs/common/Links.hpp>
-#include <paradevs/common/Parameters.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/GraphManager.hpp>
+#include <artis-star/common/Links.hpp>
+#include <artis-star/common/Parameters.hpp>
 
-#include <paradevs/kernel/sss/Model.hpp>
+#include <artis-star/kernel/sss/Model.hpp>
 
-namespace paradevs { namespace sss {
+namespace artis { namespace sss {
 
 template < class Time,
            class GraphParameters = common::NoParameters >
@@ -119,6 +119,6 @@ private:
     common::Links < Time > _link_list;
 };
 
-} } // namespace paradevs sss
+} } // namespace artis sss
 
 #endif

src/paradevs/kernel/sss/Model.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/sss/Model.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,9 +27,9 @@
 #ifndef SSS_MODEL
 #define SSS_MODEL 1
 
-#include <paradevs/common/Model.hpp>
+#include <artis-star/common/Model.hpp>
 
-namespace paradevs { namespace sss {
+namespace artis { namespace sss {
 
 template < class Time >
 class Model : public virtual common::Model < Time >
@@ -131,6 +131,6 @@ public:
     }
 };
 
-} } // namespace paradevs sss
+} } // namespace artis sss
 
 #endif

src/paradevs/kernel/sss/Simulator.hpp

@@ -1,12 +1,12 @@
 /**
  * @file kernel/sss/Simulator.hpp
- * @author The PARADEVS Development Team
+ * @author The ARTIS Development Team
  * See the AUTHORS or Authors.txt file
  */
 
 /*
- * PARADEVS - the multimodeling and simulation environment
- * This file is a part of the PARADEVS environment
+ * ARTIS - the multimodeling and simulation environment
+ * This file is a part of the ARTIS environment
  *
  * Copyright (C) 2013-2016 ULCO http://www.univ-littoral.fr
  *
@@ -27,16 +27,16 @@
 #ifndef SSS_SIMULATOR
 #define SSS_SIMULATOR 1
 
-#include <paradevs/common/Coordinator.hpp>
-#include <paradevs/common/Parameters.hpp>
-#include <paradevs/common/Simulator.hpp>
-#include <paradevs/common/utils/Trace.hpp>
+#include <artis-star/common/Coordinator.hpp>
+#include <artis-star/common/Parameters.hpp>
+#include <artis-star/common/Simulator.hpp>
+#include <artis-star/common/utils/Trace.hpp>
 
-#include <paradevs/kernel/sss/Model.hpp>
+#include <artis-star/kernel/sss/Model.hpp>
 
 #include <cassert>
 
-namespace paradevs { namespace sss {
+namespace artis { namespace sss {
 
 template < class Time, class Dynamics,
            class Parameters = common::NoParameters >
@@ -200,6 +200,6 @@ private :
     typename Time::type _time_step;
 };
 
-} } // namespace paradevs sss
+} } // namespace artis sss
 
 #endif

src/paradevs.pc.in

@@ -1,12 +0,0 @@
-prefix=@PARADEVS_PKGCONFIG_PREFIXPATH@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@PARADEVS_PKGCONFIG_LIBDIR@
-includedir=${prefix}/include
-
-Name: vle
-Description: PARADEVS multimodelling and Simulation tools
-Requires: libxml-2.0 glibmm-2.4
-Version: @PARADEVS_VERSION@
-Libs:	-L${libdir} \
-    -lpdevs-@PARADEVS_VERSION_SHORT@
-Cflags: -I${includedir}/paradevs-@PARADEVS_VERSION_SHORT@ -I@PARADEVS_PKGCONFIG_BOOSTINCLUDE_DIRS@