CDBoost HO

With pairs (port, value) and filters.

simulators/cadmium_cdboost/CMakeCache.txt

@@ -1,6 +1,6 @@
 # This is the CMakeCache file.
-# For build in directory: /home/kevin/devstone
-# It was generated by CMake: /home/kevin/clion/bin/cmake/linux/bin/cmake
+# For build in directory: /home/kevin/devstone-comparative/simulators/cadmium_cdboost
+# It was generated by CMake: /usr/bin/cmake
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
 # If you do want to change a value, simply edit, save, and exit the editor.
@@ -251,10 +251,10 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
 //Value Computed by CMake
-Devstone_BINARY_DIR:STATIC=/home/kevin/devstone
+Devstone_BINARY_DIR:STATIC=/home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 //Value Computed by CMake
-Devstone_SOURCE_DIR:STATIC=/home/kevin/devstone
+Devstone_SOURCE_DIR:STATIC=/home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 
 ########################
@@ -304,21 +304,21 @@ Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/kevin/devstone
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/kevin/devstone-comparative/simulators/cadmium_cdboost
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
 //Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=15
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=10
 //Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
+CMAKE_CACHE_PATCH_VERSION:INTERNAL=2
 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
 CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
 //Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
 //Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/home/kevin/clion/bin/cmake/linux/bin/cpack
+CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
 //Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/home/kevin/clion/bin/cmake/linux/bin/ctest
+CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
 //ADVANCED property for variable: CMAKE_CXX_COMPILER
 CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
@@ -387,7 +387,7 @@ CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
 CMAKE_HAVE_PTHREAD_H:INTERNAL=1
 //Source directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/kevin/devstone/
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/
 //Install .so files without execute permission.
 CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
 //ADVANCED property for variable: CMAKE_LINKER
@@ -417,7 +417,7 @@ CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_RANLIB
 CMAKE_RANLIB-ADVANCED:INTERNAL=1
 //Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/home/kevin/clion/bin/cmake/linux/share/cmake-3.15
+CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.10
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
 CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

simulators/cadmium_cdboost/CMakeFiles/CMakeDirectoryInformation.cmake

@@ -1,9 +1,9 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/kevin/devstone")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/kevin/devstone")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/kevin/devstone-comparative/simulators/cadmium_cdboost")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/kevin/devstone-comparative/simulators/cadmium_cdboost")
 
 # Force unix paths in dependencies.
 set(CMAKE_FORCE_UNIX_PATHS 1)

simulators/cadmium_cdboost/CMakeFiles/Makefile.cmake

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # The generator used is:
 set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
@@ -7,103 +7,36 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
 # The top level Makefile was generated from the following files:
 set(CMAKE_MAKEFILE_DEPENDS
   "CMakeCache.txt"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCCompiler.cmake.in"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCCompilerABI.c"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCInformation.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCXXCompiler.cmake.in"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCXXCompilerABI.cpp"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCXXInformation.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCommonLanguageInclude.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeCompilerIdDetection.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCXXCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCompileFeatures.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCompilerABI.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineCompilerId.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeDetermineSystem.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeFindBinUtils.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeGenericSystem.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeInitializeConfigs.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeLanguageInformation.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeParseImplicitIncludeInfo.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeParseImplicitLinkInfo.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeSystem.cmake.in"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeSystemSpecificInformation.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeSystemSpecificInitialize.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeTestCCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeTestCXXCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CMakeTestCompilerCommon.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CheckCSourceCompiles.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CheckCXXCompilerFlag.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CheckCXXSourceCompiles.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CheckIncludeFile.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/CheckLibraryExists.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/ADSP-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Borland-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Clang-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Cray-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GHS-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU-C.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU-CXX.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU-FindBinUtils.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/GNU.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/HP-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/IAR-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Intel-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/MSVC-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/PGI-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/PathScale-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/SCO-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/TI-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/Watcom-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/XL-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/XLClang-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/FindBoost.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/FindPackageHandleStandardArgs.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/FindPackageMessage.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/FindThreads.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Internal/CMakeCheckCompilerFlag.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Internal/FeatureTesting.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/Linux-Determine-CXX.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/Linux-GNU-C.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/Linux-GNU-CXX.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/Linux-GNU.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/Linux.cmake"
-  "/home/kevin/clion/bin/cmake/linux/share/cmake-3.15/Modules/Platform/UnixPaths.cmake"
-  "CMakeFiles/3.15.3/CMakeCCompiler.cmake"
-  "CMakeFiles/3.15.3/CMakeCXXCompiler.cmake"
-  "CMakeFiles/3.15.3/CMakeSystem.cmake"
+  "CMakeFiles/3.10.2/CMakeCCompiler.cmake"
+  "CMakeFiles/3.10.2/CMakeCXXCompiler.cmake"
+  "CMakeFiles/3.10.2/CMakeSystem.cmake"
   "CMakeLists.txt"
+  "/usr/share/cmake-3.10/Modules/CMakeCInformation.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeCXXInformation.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeGenericSystem.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake"
+  "/usr/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckCXXCompilerFlag.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckCXXSourceCompiles.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckIncludeFile.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckLibraryExists.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckSymbolExists.cmake"
+  "/usr/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
+  "/usr/share/cmake-3.10/Modules/Compiler/GNU-C.cmake"
+  "/usr/share/cmake-3.10/Modules/Compiler/GNU-CXX.cmake"
+  "/usr/share/cmake-3.10/Modules/Compiler/GNU.cmake"
+  "/usr/share/cmake-3.10/Modules/FindBoost.cmake"
+  "/usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake"
+  "/usr/share/cmake-3.10/Modules/FindPackageMessage.cmake"
+  "/usr/share/cmake-3.10/Modules/FindThreads.cmake"
+  "/usr/share/cmake-3.10/Modules/Platform/Linux-GNU-C.cmake"
+  "/usr/share/cmake-3.10/Modules/Platform/Linux-GNU-CXX.cmake"
+  "/usr/share/cmake-3.10/Modules/Platform/Linux-GNU.cmake"
+  "/usr/share/cmake-3.10/Modules/Platform/Linux.cmake"
+  "/usr/share/cmake-3.10/Modules/Platform/UnixPaths.cmake"
   )
 
 # The corresponding makefile is:
@@ -114,11 +47,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
 
 # Byproducts of CMake generate step:
 set(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/3.15.3/CMakeSystem.cmake"
-  "CMakeFiles/3.15.3/CMakeCCompiler.cmake"
-  "CMakeFiles/3.15.3/CMakeCXXCompiler.cmake"
-  "CMakeFiles/3.15.3/CMakeCCompiler.cmake"
-  "CMakeFiles/3.15.3/CMakeCXXCompiler.cmake"
   "CMakeFiles/CMakeDirectoryInformation.cmake"
   )
 

simulators/cadmium_cdboost/CMakeFiles/Makefile2

@@ -1,11 +1,21 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Default target executed when no arguments are given to make.
 default_target: all
 
 .PHONY : default_target
 
+# The main recursive all target
+all:
+
+.PHONY : all
+
+# The main recursive preinstall target
+preinstall:
+
+.PHONY : preinstall
+
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -35,43 +45,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
-
-#=============================================================================
-# Directory level rules for the build root directory
-
-# The main recursive "all" target.
-all: CMakeFiles/cdboost-devstone.dir/all
-all: CMakeFiles/cadmium-dynamic-conc-devstone.dir/all
-all: CMakeFiles/cadmium-dynamic-devstone.dir/all
-all: CMakeFiles/cadmium-devstone.dir/all
-
-.PHONY : all
-
-# The main recursive "clean" target.
-clean: CMakeFiles/cdboost-devstone.dir/clean
-clean: CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean
-clean: CMakeFiles/cadmium-dynamic-devstone.dir/clean
-clean: CMakeFiles/cadmium-devstone.dir/clean
-
-.PHONY : clean
-
-# The main recursive "preinstall" target.
-preinstall:
-
-.PHONY : preinstall
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 #=============================================================================
 # Target rules for target CMakeFiles/cdboost-devstone.dir
@@ -80,14 +66,19 @@ preinstall:
 CMakeFiles/cdboost-devstone.dir/all:
 	$(MAKE) -f CMakeFiles/cdboost-devstone.dir/build.make CMakeFiles/cdboost-devstone.dir/depend
 	$(MAKE) -f CMakeFiles/cdboost-devstone.dir/build.make CMakeFiles/cdboost-devstone.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=7,8 "Built target cdboost-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=7,8 "Built target cdboost-devstone"
 .PHONY : CMakeFiles/cdboost-devstone.dir/all
 
+# Include target in all.
+all: CMakeFiles/cdboost-devstone.dir/all
+
+.PHONY : all
+
 # Build rule for subdir invocation for target.
 CMakeFiles/cdboost-devstone.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 2
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 2
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/cdboost-devstone.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 0
 .PHONY : CMakeFiles/cdboost-devstone.dir/rule
 
 # Convenience name for target.
@@ -100,6 +91,11 @@ CMakeFiles/cdboost-devstone.dir/clean:
 	$(MAKE) -f CMakeFiles/cdboost-devstone.dir/build.make CMakeFiles/cdboost-devstone.dir/clean
 .PHONY : CMakeFiles/cdboost-devstone.dir/clean
 
+# clean rule for target.
+clean: CMakeFiles/cdboost-devstone.dir/clean
+
+.PHONY : clean
+
 #=============================================================================
 # Target rules for target CMakeFiles/cadmium-dynamic-conc-devstone.dir
 
@@ -107,14 +103,19 @@ CMakeFiles/cdboost-devstone.dir/clean:
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/all:
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-conc-devstone.dir/build.make CMakeFiles/cadmium-dynamic-conc-devstone.dir/depend
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-conc-devstone.dir/build.make CMakeFiles/cadmium-dynamic-conc-devstone.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=3,4 "Built target cadmium-dynamic-conc-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=3,4 "Built target cadmium-dynamic-conc-devstone"
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/all
 
+# Include target in all.
+all: CMakeFiles/cadmium-dynamic-conc-devstone.dir/all
+
+.PHONY : all
+
 # Build rule for subdir invocation for target.
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 2
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 2
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/cadmium-dynamic-conc-devstone.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 0
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/rule
 
 # Convenience name for target.
@@ -127,6 +128,11 @@ CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean:
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-conc-devstone.dir/build.make CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean
 
+# clean rule for target.
+clean: CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean
+
+.PHONY : clean
+
 #=============================================================================
 # Target rules for target CMakeFiles/cadmium-dynamic-devstone.dir
 
@@ -134,14 +140,19 @@ CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean:
 CMakeFiles/cadmium-dynamic-devstone.dir/all:
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-devstone.dir/build.make CMakeFiles/cadmium-dynamic-devstone.dir/depend
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-devstone.dir/build.make CMakeFiles/cadmium-dynamic-devstone.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=5,6 "Built target cadmium-dynamic-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=5,6 "Built target cadmium-dynamic-devstone"
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/all
 
+# Include target in all.
+all: CMakeFiles/cadmium-dynamic-devstone.dir/all
+
+.PHONY : all
+
 # Build rule for subdir invocation for target.
 CMakeFiles/cadmium-dynamic-devstone.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 2
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 2
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/cadmium-dynamic-devstone.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 0
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/rule
 
 # Convenience name for target.
@@ -154,6 +165,11 @@ CMakeFiles/cadmium-dynamic-devstone.dir/clean:
 	$(MAKE) -f CMakeFiles/cadmium-dynamic-devstone.dir/build.make CMakeFiles/cadmium-dynamic-devstone.dir/clean
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/clean
 
+# clean rule for target.
+clean: CMakeFiles/cadmium-dynamic-devstone.dir/clean
+
+.PHONY : clean
+
 #=============================================================================
 # Target rules for target CMakeFiles/cadmium-devstone.dir
 
@@ -161,14 +177,19 @@ CMakeFiles/cadmium-dynamic-devstone.dir/clean:
 CMakeFiles/cadmium-devstone.dir/all:
 	$(MAKE) -f CMakeFiles/cadmium-devstone.dir/build.make CMakeFiles/cadmium-devstone.dir/depend
 	$(MAKE) -f CMakeFiles/cadmium-devstone.dir/build.make CMakeFiles/cadmium-devstone.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=1,2 "Built target cadmium-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=1,2 "Built target cadmium-devstone"
 .PHONY : CMakeFiles/cadmium-devstone.dir/all
 
+# Include target in all.
+all: CMakeFiles/cadmium-devstone.dir/all
+
+.PHONY : all
+
 # Build rule for subdir invocation for target.
 CMakeFiles/cadmium-devstone.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 2
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 2
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/cadmium-devstone.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 0
 .PHONY : CMakeFiles/cadmium-devstone.dir/rule
 
 # Convenience name for target.
@@ -181,6 +202,11 @@ CMakeFiles/cadmium-devstone.dir/clean:
 	$(MAKE) -f CMakeFiles/cadmium-devstone.dir/build.make CMakeFiles/cadmium-devstone.dir/clean
 .PHONY : CMakeFiles/cadmium-devstone.dir/clean
 
+# clean rule for target.
+clean: CMakeFiles/cadmium-devstone.dir/clean
+
+.PHONY : clean
+
 #=============================================================================
 # Special targets to cleanup operation of make.
 
@@ -188,6 +214,6 @@ CMakeFiles/cadmium-devstone.dir/clean:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 

simulators/cadmium_cdboost/CMakeFiles/TargetDirectories.txt

@@ -1,6 +1,6 @@
-/home/kevin/devstone/CMakeFiles/edit_cache.dir
-/home/kevin/devstone/CMakeFiles/rebuild_cache.dir
-/home/kevin/devstone/CMakeFiles/cdboost-devstone.dir
-/home/kevin/devstone/CMakeFiles/cadmium-dynamic-conc-devstone.dir
-/home/kevin/devstone/CMakeFiles/cadmium-dynamic-devstone.dir
-/home/kevin/devstone/CMakeFiles/cadmium-devstone.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/edit_cache.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/rebuild_cache.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/CXX.includecache

@@ -6,7 +6,7 @@
 
 #IncludeRegexTransform: 
 
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 time.h
 -
 sys/types.h
@@ -20,17 +20,17 @@ string.h
 stdlib.h
 -
 
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 dhry_2.c
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp
@@ -38,9 +38,9 @@ cadmium/modeling/message_bag.hpp
 limits
 -
 ../dhry/dhry_1.c
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 
-/home/kevin/devstone/src/cadmium-devstone.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp
 iostream
 -
 chrono
@@ -62,11 +62,11 @@ cadmium/modeling/ports.hpp
 cadmium/engine/pdevs_runner.hpp
 -
 cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/DependInfo.cmake

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/kevin/devstone/src/cadmium-devstone.cpp" "/home/kevin/devstone/CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o"
+  "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp" "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/build.make

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Delete rule output on recipe failure.
 .DELETE_ON_ERROR:
@@ -34,19 +34,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # Include any dependencies generated for this target.
 include CMakeFiles/cadmium-devstone.dir/depend.make
@@ -59,16 +59,27 @@ include CMakeFiles/cadmium-devstone.dir/flags.make
 
 CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o: CMakeFiles/cadmium-devstone.dir/flags.make
 CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o: src/cadmium-devstone.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o -c /home/kevin/devstone/src/cadmium-devstone.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o -c /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp
 
 CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.i: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone/src/cadmium-devstone.cpp > CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.i
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp > CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.i
 
 CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone/src/cadmium-devstone.cpp -o CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.s
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp -o CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.s
+
+CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.requires:
+
+.PHONY : CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.requires
+
+CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.provides: CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.requires
+	$(MAKE) -f CMakeFiles/cadmium-devstone.dir/build.make CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.provides.build
+.PHONY : CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.provides
+
+CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.provides.build: CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o
+
 
 # Object files for target cadmium-devstone
 cadmium__devstone_OBJECTS = \
@@ -81,7 +92,7 @@ cadmium-devstone: CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o
 cadmium-devstone: CMakeFiles/cadmium-devstone.dir/build.make
 cadmium-devstone: /usr/lib/x86_64-linux-gnu/libboost_program_options.a
 cadmium-devstone: CMakeFiles/cadmium-devstone.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-devstone"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/cadmium-devstone.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -89,11 +100,15 @@ CMakeFiles/cadmium-devstone.dir/build: cadmium-devstone
 
 .PHONY : CMakeFiles/cadmium-devstone.dir/build
 
+CMakeFiles/cadmium-devstone.dir/requires: CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o.requires
+
+.PHONY : CMakeFiles/cadmium-devstone.dir/requires
+
 CMakeFiles/cadmium-devstone.dir/clean:
 	$(CMAKE_COMMAND) -P CMakeFiles/cadmium-devstone.dir/cmake_clean.cmake
 .PHONY : CMakeFiles/cadmium-devstone.dir/clean
 
 CMakeFiles/cadmium-devstone.dir/depend:
-	cd /home/kevin/devstone && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone/CMakeFiles/cadmium-devstone.dir/DependInfo.cmake --color=$(COLOR)
+	cd /home/kevin/devstone-comparative/simulators/cadmium_cdboost && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/DependInfo.cmake --color=$(COLOR)
 .PHONY : CMakeFiles/cadmium-devstone.dir/depend
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/cmake_clean.cmake

@@ -1,7 +1,7 @@
 file(REMOVE_RECURSE
   "CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o"
-  "cadmium-devstone"
   "cadmium-devstone.pdb"
+  "cadmium-devstone"
 )
 
 # Per-language clean rules from dependency scanning.

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/depend.internal

@@ -2,12 +2,12 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 CMakeFiles/cadmium-devstone.dir/src/cadmium-devstone.cpp.o
- /home/kevin/devstone/dhry/dhry.h
- /home/kevin/devstone/dhry/dhry_1.c
- /home/kevin/devstone/dhry/dhry_2.c
- /home/kevin/devstone/src/cadmium-devstone-atomic.hpp
- /home/kevin/devstone/src/cadmium-devstone.cpp
- /home/kevin/devstone/src/cadmium-event-reader.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
  simulators/cadmium/include/cadmium/concept/atomic_model_assert.hpp
  simulators/cadmium/include/cadmium/concept/concept_helpers.hpp
  simulators/cadmium/include/cadmium/concept/coupled_model_assert.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-devstone.dir/flags.make

@@ -1,10 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # compile CXX with /usr/bin/c++
 CXX_FLAGS =  -pedantic --std=c++17 -fPIC -g  
 
 CXX_DEFINES = 
 
-CXX_INCLUDES = -I/home/kevin/devstone/simulators/cadmium/include 
+CXX_INCLUDES = -I/home/kevin/devstone-comparative/simulators/cadmium_cdboost/simulators/cadmium/include 
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/CXX.includecache

@@ -6,7 +6,7 @@
 
 #IncludeRegexTransform: 
 
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 time.h
 -
 sys/types.h
@@ -20,17 +20,17 @@ string.h
 stdlib.h
 -
 
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 dhry_2.c
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp
@@ -38,9 +38,9 @@ cadmium/modeling/message_bag.hpp
 limits
 -
 ../dhry/dhry_1.c
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 
-/home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
 iostream
 -
 chrono
@@ -54,15 +54,15 @@ boost/program_options.hpp
 cadmium/engine/pdevs_dynamic_runner.hpp
 -
 dynamic/LI_generator.cpp
-/home/kevin/devstone/src/dynamic/LI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
 dynamic/HI_generator.cpp
-/home/kevin/devstone/src/dynamic/HI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
 dynamic/HO_generator.cpp
-/home/kevin/devstone/src/dynamic/HO_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
 dynamic/HOmod_generator.cpp
-/home/kevin/devstone/src/dynamic/HOmod_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
 
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp
@@ -74,15 +74,15 @@ fstream
 cassert
 -
 
-/home/kevin/devstone/src/dynamic/HI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -100,15 +100,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/HO_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -126,15 +126,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/HOmod_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -152,15 +152,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/LI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/DependInfo.cmake

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/kevin/devstone/src/cadmium-dynamic-devstone.cpp" "/home/kevin/devstone/CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
+  "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp" "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/build.make

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Delete rule output on recipe failure.
 .DELETE_ON_ERROR:
@@ -34,19 +34,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # Include any dependencies generated for this target.
 include CMakeFiles/cadmium-dynamic-conc-devstone.dir/depend.make
@@ -59,16 +59,27 @@ include CMakeFiles/cadmium-dynamic-conc-devstone.dir/flags.make
 
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o: CMakeFiles/cadmium-dynamic-conc-devstone.dir/flags.make
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o: src/cadmium-dynamic-devstone.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o -c /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o -c /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
 
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.i: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp > CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.i
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp > CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.i
 
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp -o CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.s
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp -o CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.s
+
+CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires:
+
+.PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+
+CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides: CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+	$(MAKE) -f CMakeFiles/cadmium-dynamic-conc-devstone.dir/build.make CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides.build
+.PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides
+
+CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides.build: CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o
+
 
 # Object files for target cadmium-dynamic-conc-devstone
 cadmium__dynamic__conc__devstone_OBJECTS = \
@@ -86,8 +97,9 @@ cadmium-dynamic-conc-devstone: /usr/lib/x86_64-linux-gnu/libboost_chrono.a
 cadmium-dynamic-conc-devstone: /usr/lib/x86_64-linux-gnu/libboost_system.a
 cadmium-dynamic-conc-devstone: /usr/lib/x86_64-linux-gnu/libboost_date_time.a
 cadmium-dynamic-conc-devstone: /usr/lib/x86_64-linux-gnu/libboost_atomic.a
+cadmium-dynamic-conc-devstone: /usr/lib/x86_64-linux-gnu/libpthread.so
 cadmium-dynamic-conc-devstone: CMakeFiles/cadmium-dynamic-conc-devstone.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-dynamic-conc-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-dynamic-conc-devstone"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/cadmium-dynamic-conc-devstone.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -95,11 +107,15 @@ CMakeFiles/cadmium-dynamic-conc-devstone.dir/build: cadmium-dynamic-conc-devston
 
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/build
 
+CMakeFiles/cadmium-dynamic-conc-devstone.dir/requires: CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+
+.PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/requires
+
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean:
 	$(CMAKE_COMMAND) -P CMakeFiles/cadmium-dynamic-conc-devstone.dir/cmake_clean.cmake
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/clean
 
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/depend:
-	cd /home/kevin/devstone && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone/CMakeFiles/cadmium-dynamic-conc-devstone.dir/DependInfo.cmake --color=$(COLOR)
+	cd /home/kevin/devstone-comparative/simulators/cadmium_cdboost && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/DependInfo.cmake --color=$(COLOR)
 .PHONY : CMakeFiles/cadmium-dynamic-conc-devstone.dir/depend
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/cmake_clean.cmake

@@ -1,7 +1,7 @@
 file(REMOVE_RECURSE
   "CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
-  "cadmium-dynamic-conc-devstone"
   "cadmium-dynamic-conc-devstone.pdb"
+  "cadmium-dynamic-conc-devstone"
 )
 
 # Per-language clean rules from dependency scanning.

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/depend.internal

@@ -2,16 +2,16 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 CMakeFiles/cadmium-dynamic-conc-devstone.dir/src/cadmium-dynamic-devstone.cpp.o
- /home/kevin/devstone/dhry/dhry.h
- /home/kevin/devstone/dhry/dhry_1.c
- /home/kevin/devstone/dhry/dhry_2.c
- /home/kevin/devstone/src/cadmium-devstone-atomic.hpp
- /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
- /home/kevin/devstone/src/cadmium-event-reader.hpp
- /home/kevin/devstone/src/dynamic/HI_generator.cpp
- /home/kevin/devstone/src/dynamic/HO_generator.cpp
- /home/kevin/devstone/src/dynamic/HOmod_generator.cpp
- /home/kevin/devstone/src/dynamic/LI_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
  simulators/cadmium/include/cadmium/concept/atomic_model_assert.hpp
  simulators/cadmium/include/cadmium/concept/concept_helpers.hpp
  simulators/cadmium/include/cadmium/concept/coupled_model_assert.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-conc-devstone.dir/flags.make

@@ -1,10 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # compile CXX with /usr/bin/c++
 CXX_FLAGS =  -pedantic --std=c++17 -fPIC -g  
 
 CXX_DEFINES = -DCADMIUM_EXECUTE_CONCURRENT
 
-CXX_INCLUDES = -I/home/kevin/devstone/simulators/cadmium/include 
+CXX_INCLUDES = -I/home/kevin/devstone-comparative/simulators/cadmium_cdboost/simulators/cadmium/include 
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/CXX.includecache

@@ -6,7 +6,7 @@
 
 #IncludeRegexTransform: 
 
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 time.h
 -
 sys/types.h
@@ -20,17 +20,17 @@ string.h
 stdlib.h
 -
 
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 dhry_2.c
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp
@@ -38,9 +38,9 @@ cadmium/modeling/message_bag.hpp
 limits
 -
 ../dhry/dhry_1.c
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 
-/home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
 iostream
 -
 chrono
@@ -54,15 +54,15 @@ boost/program_options.hpp
 cadmium/engine/pdevs_dynamic_runner.hpp
 -
 dynamic/LI_generator.cpp
-/home/kevin/devstone/src/dynamic/LI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
 dynamic/HI_generator.cpp
-/home/kevin/devstone/src/dynamic/HI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
 dynamic/HO_generator.cpp
-/home/kevin/devstone/src/dynamic/HO_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
 dynamic/HOmod_generator.cpp
-/home/kevin/devstone/src/dynamic/HOmod_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
 
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/message_bag.hpp
@@ -74,15 +74,15 @@ fstream
 cassert
 -
 
-/home/kevin/devstone/src/dynamic/HI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -100,15 +100,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/HO_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -126,15 +126,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/HOmod_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp
@@ -152,15 +152,15 @@ cadmium/logger/tuple_to_ostream.hpp
 cadmium/logger/common_loggers.hpp
 -
 
-/home/kevin/devstone/src/dynamic/LI_generator.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
 chrono
 -
 boost/format.hpp
 -
 ../cadmium-devstone-atomic.hpp
-/home/kevin/devstone/src/cadmium-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
 ../cadmium-event-reader.hpp
-/home/kevin/devstone/src/cadmium-event-reader.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
 cadmium/modeling/ports.hpp
 -
 cadmium/modeling/dynamic_model_translator.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/DependInfo.cmake

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/kevin/devstone/src/cadmium-dynamic-devstone.cpp" "/home/kevin/devstone/CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
+  "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp" "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/build.make

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Delete rule output on recipe failure.
 .DELETE_ON_ERROR:
@@ -34,19 +34,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # Include any dependencies generated for this target.
 include CMakeFiles/cadmium-dynamic-devstone.dir/depend.make
@@ -59,16 +59,27 @@ include CMakeFiles/cadmium-dynamic-devstone.dir/flags.make
 
 CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o: CMakeFiles/cadmium-dynamic-devstone.dir/flags.make
 CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o: src/cadmium-dynamic-devstone.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o -c /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o -c /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
 
 CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.i: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp > CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.i
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp > CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.i
 
 CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp -o CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.s
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp -o CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.s
+
+CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires:
+
+.PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+
+CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides: CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+	$(MAKE) -f CMakeFiles/cadmium-dynamic-devstone.dir/build.make CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides.build
+.PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides
+
+CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.provides.build: CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o
+
 
 # Object files for target cadmium-dynamic-devstone
 cadmium__dynamic__devstone_OBJECTS = \
@@ -81,7 +92,7 @@ cadmium-dynamic-devstone: CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dy
 cadmium-dynamic-devstone: CMakeFiles/cadmium-dynamic-devstone.dir/build.make
 cadmium-dynamic-devstone: /usr/lib/x86_64-linux-gnu/libboost_program_options.a
 cadmium-dynamic-devstone: CMakeFiles/cadmium-dynamic-devstone.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-dynamic-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cadmium-dynamic-devstone"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/cadmium-dynamic-devstone.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -89,11 +100,15 @@ CMakeFiles/cadmium-dynamic-devstone.dir/build: cadmium-dynamic-devstone
 
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/build
 
+CMakeFiles/cadmium-dynamic-devstone.dir/requires: CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o.requires
+
+.PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/requires
+
 CMakeFiles/cadmium-dynamic-devstone.dir/clean:
 	$(CMAKE_COMMAND) -P CMakeFiles/cadmium-dynamic-devstone.dir/cmake_clean.cmake
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/clean
 
 CMakeFiles/cadmium-dynamic-devstone.dir/depend:
-	cd /home/kevin/devstone && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone/CMakeFiles/cadmium-dynamic-devstone.dir/DependInfo.cmake --color=$(COLOR)
+	cd /home/kevin/devstone-comparative/simulators/cadmium_cdboost && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/DependInfo.cmake --color=$(COLOR)
 .PHONY : CMakeFiles/cadmium-dynamic-devstone.dir/depend
 

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/cmake_clean.cmake

@@ -1,7 +1,7 @@
 file(REMOVE_RECURSE
   "CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o"
-  "cadmium-dynamic-devstone"
   "cadmium-dynamic-devstone.pdb"
+  "cadmium-dynamic-devstone"
 )
 
 # Per-language clean rules from dependency scanning.

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/depend.internal

@@ -2,16 +2,16 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 CMakeFiles/cadmium-dynamic-devstone.dir/src/cadmium-dynamic-devstone.cpp.o
- /home/kevin/devstone/dhry/dhry.h
- /home/kevin/devstone/dhry/dhry_1.c
- /home/kevin/devstone/dhry/dhry_2.c
- /home/kevin/devstone/src/cadmium-devstone-atomic.hpp
- /home/kevin/devstone/src/cadmium-dynamic-devstone.cpp
- /home/kevin/devstone/src/cadmium-event-reader.hpp
- /home/kevin/devstone/src/dynamic/HI_generator.cpp
- /home/kevin/devstone/src/dynamic/HO_generator.cpp
- /home/kevin/devstone/src/dynamic/HOmod_generator.cpp
- /home/kevin/devstone/src/dynamic/LI_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-devstone-atomic.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-dynamic-devstone.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cadmium-event-reader.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HI_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HO_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/HOmod_generator.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/dynamic/LI_generator.cpp
  simulators/cadmium/include/cadmium/concept/atomic_model_assert.hpp
  simulators/cadmium/include/cadmium/concept/concept_helpers.hpp
  simulators/cadmium/include/cadmium/concept/coupled_model_assert.hpp

simulators/cadmium_cdboost/CMakeFiles/cadmium-dynamic-devstone.dir/flags.make

@@ -1,10 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # compile CXX with /usr/bin/c++
 CXX_FLAGS =  -pedantic --std=c++17 -fPIC -g  
 
 CXX_DEFINES = 
 
-CXX_INCLUDES = -I/home/kevin/devstone/simulators/cadmium/include 
+CXX_INCLUDES = -I/home/kevin/devstone-comparative/simulators/cadmium_cdboost/simulators/cadmium/include 
 

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/CXX.includecache

@@ -6,7 +6,7 @@
 
 #IncludeRegexTransform: 
 
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 time.h
 -
 sys/types.h
@@ -20,23 +20,41 @@ string.h
 stdlib.h
 -
 
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 dhry_2.c
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 
-/home/kevin/devstone/dhry/dhry_2.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
 dhry.h
-/home/kevin/devstone/dhry/dhry.h
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
 
-/home/kevin/devstone/src/cdboost-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic-pair.hpp
 boost/simulation/pdevs/atomic.hpp
 -
 ../dhry/dhry_1.c
-/home/kevin/devstone/dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
 
-/home/kevin/devstone/src/cdboost-devstone.cpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic.hpp
+boost/simulation/pdevs/atomic.hpp
+-
+../dhry/dhry_1.c
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
+
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-filter.hpp
+boost/simulation/pdevs/atomic.hpp
+-
+
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-input-stream-pair.hpp
+istream
+-
+sstream
+-
+boost/simulation/pdevs/atomic.hpp
+-
+
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp
 iostream
 -
 chrono
@@ -50,7 +68,13 @@ boost/program_options.hpp
 boost/simulation.hpp
 -
 cdboost-devstone-atomic.hpp
-/home/kevin/devstone/src/cdboost-devstone-atomic.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic.hpp
+cdboost-devstone-atomic-pair.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic-pair.hpp
+cdboost-devstone-filter.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-filter.hpp
+cdboost-devstone-input-stream-pair.hpp
+/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-input-stream-pair.hpp
 
 simulators/cdboost/include/boost/simulation.hpp
 boost/simulation/pdevs/atomic.hpp

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/DependInfo.cmake

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/kevin/devstone/src/cdboost-devstone.cpp" "/home/kevin/devstone/CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o"
+  "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp" "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/build.make

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Delete rule output on recipe failure.
 .DELETE_ON_ERROR:
@@ -34,19 +34,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # Include any dependencies generated for this target.
 include CMakeFiles/cdboost-devstone.dir/depend.make
@@ -59,16 +59,27 @@ include CMakeFiles/cdboost-devstone.dir/flags.make
 
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: CMakeFiles/cdboost-devstone.dir/flags.make
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o -c /home/kevin/devstone/src/cdboost-devstone.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o -c /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp
 
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.i: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone/src/cdboost-devstone.cpp > CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.i
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp > CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.i
 
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone/src/cdboost-devstone.cpp -o CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.s
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp -o CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.s
+
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.requires:
+
+.PHONY : CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.requires
+
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.provides: CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.requires
+	$(MAKE) -f CMakeFiles/cdboost-devstone.dir/build.make CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.provides.build
+.PHONY : CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.provides
+
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.provides.build: CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o
+
 
 # Object files for target cdboost-devstone
 cdboost__devstone_OBJECTS = \
@@ -81,7 +92,7 @@ cdboost-devstone: CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o
 cdboost-devstone: CMakeFiles/cdboost-devstone.dir/build.make
 cdboost-devstone: /usr/lib/x86_64-linux-gnu/libboost_program_options.a
 cdboost-devstone: CMakeFiles/cdboost-devstone.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cdboost-devstone"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX executable cdboost-devstone"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/cdboost-devstone.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -89,11 +100,15 @@ CMakeFiles/cdboost-devstone.dir/build: cdboost-devstone
 
 .PHONY : CMakeFiles/cdboost-devstone.dir/build
 
+CMakeFiles/cdboost-devstone.dir/requires: CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o.requires
+
+.PHONY : CMakeFiles/cdboost-devstone.dir/requires
+
 CMakeFiles/cdboost-devstone.dir/clean:
 	$(CMAKE_COMMAND) -P CMakeFiles/cdboost-devstone.dir/cmake_clean.cmake
 .PHONY : CMakeFiles/cdboost-devstone.dir/clean
 
 CMakeFiles/cdboost-devstone.dir/depend:
-	cd /home/kevin/devstone && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone /home/kevin/devstone/CMakeFiles/cdboost-devstone.dir/DependInfo.cmake --color=$(COLOR)
+	cd /home/kevin/devstone-comparative/simulators/cadmium_cdboost && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/DependInfo.cmake --color=$(COLOR)
 .PHONY : CMakeFiles/cdboost-devstone.dir/depend
 

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/cmake_clean.cmake

@@ -1,7 +1,7 @@
 file(REMOVE_RECURSE
   "CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o"
-  "cdboost-devstone"
   "cdboost-devstone.pdb"
+  "cdboost-devstone"
 )
 
 # Per-language clean rules from dependency scanning.

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/depend.internal

@@ -2,11 +2,14 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o
- /home/kevin/devstone/dhry/dhry.h
- /home/kevin/devstone/dhry/dhry_1.c
- /home/kevin/devstone/dhry/dhry_2.c
- /home/kevin/devstone/src/cdboost-devstone-atomic.hpp
- /home/kevin/devstone/src/cdboost-devstone.cpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry.h
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_1.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/dhry/dhry_2.c
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic-pair.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-atomic.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-filter.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone-input-stream-pair.hpp
+ /home/kevin/devstone-comparative/simulators/cadmium_cdboost/src/cdboost-devstone.cpp
  simulators/cdboost/include/boost/simulation.hpp
  simulators/cdboost/include/boost/simulation/convenience.hpp
  simulators/cdboost/include/boost/simulation/model.hpp

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/depend.make

@@ -4,7 +4,10 @@
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: dhry/dhry.h
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: dhry/dhry_1.c
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: dhry/dhry_2.c
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone-atomic-pair.hpp
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone-atomic.hpp
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone-filter.hpp
+CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone-input-stream-pair.hpp
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: src/cdboost-devstone.cpp
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: simulators/cdboost/include/boost/simulation.hpp
 CMakeFiles/cdboost-devstone.dir/src/cdboost-devstone.cpp.o: simulators/cdboost/include/boost/simulation/convenience.hpp

simulators/cadmium_cdboost/CMakeFiles/cdboost-devstone.dir/flags.make

@@ -1,10 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # compile CXX with /usr/bin/c++
 CXX_FLAGS =  -pedantic --std=c++17 -fPIC -g  
 
 CXX_DEFINES = 
 
-CXX_INCLUDES = -I/home/kevin/devstone/simulators/cdboost/include 
+CXX_INCLUDES = -I/home/kevin/devstone-comparative/simulators/cadmium_cdboost/simulators/cdboost/include 
 

simulators/cadmium_cdboost/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.15
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -39,19 +39,19 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /home/kevin/clion/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /home/kevin/clion/bin/cmake/linux/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/kevin/devstone
+CMAKE_SOURCE_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/kevin/devstone
+CMAKE_BINARY_DIR = /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 #=============================================================================
 # Targets provided globally by CMake.
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /home/kevin/devstone
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
-	/home/kevin/clion/bin/cmake/linux/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+	/usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -70,7 +70,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/home/kevin/clion/bin/cmake/linux/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -80,9 +80,9 @@ rebuild_cache/fast: rebuild_cache
 
 # The main all target
 all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles /home/kevin/devstone/CMakeFiles/progress.marks
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles/progress.marks
 	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/kevin/devstone-comparative/simulators/cadmium_cdboost/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
@@ -107,7 +107,7 @@ preinstall/fast:
 
 # clear depends
 depend:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 #=============================================================================
@@ -278,6 +278,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 

simulators/cadmium_cdboost/cmake_install.cmake

@@ -1,4 +1,4 @@
-# Install script for directory: /home/kevin/devstone
+# Install script for directory: /home/kevin/devstone-comparative/simulators/cadmium_cdboost
 
 # Set the install prefix
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -45,5 +45,5 @@ endif()
 
 string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
        "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "/home/kevin/devstone/${CMAKE_INSTALL_MANIFEST}"
+file(WRITE "/home/kevin/devstone-comparative/simulators/cadmium_cdboost/${CMAKE_INSTALL_MANIFEST}"
      "${CMAKE_INSTALL_MANIFEST_CONTENT}")

simulators/cadmium_cdboost/src/cdboost-devstone-atomic-pair.hpp

@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2013-2014, Carleton University, Universite de Nice-Sophia Antipolis
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef P_DEVSTONE_ATOMIC_PAIR_H
+#define P_DEVSTONE_ATOMIC_PAIR_H
+
+#include <boost/simulation/pdevs/atomic.hpp>
+#include "../dhry/dhry_1.c"
+
+namespace cdpp {
+/**
+ * @brief PDEVStone Atomic Model.
+ *
+ * PDEVStone (InternalTime, ExternalTime, Period):
+ * This model executes:
+ * - a Dhrystone for InternalCycles on each Internal transition,
+ * - a Dhrystone for ExternalCycles on each External transition,
+ * - the time advance after each external transition is Period.
+*/
+template<class TIME, class MSG>
+class PDEVStoneAtomicPair : public boost::simulation::pdevs::atomic<TIME, MSG>
+{
+    std::vector<MSG> _out;
+    int _internal_cycles;
+    int _external_cycles;
+    TIME _period;
+    int _queued_processes;
+public:
+    /**
+     * @brief DEVStoneAtomic constructor.
+     *
+     * @param internal_cycles the cycles dhrystone will be run in internal transitions.
+     * @param external_cycles the cycles dhrystone will be run in external transitions.
+     * @param period the time used for all time_advances.
+     */
+    explicit PDEVStoneAtomicPair(int internal_cycles, int external_cycles,  TIME period)
+        : _internal_cycles(internal_cycles), _external_cycles(external_cycles), _period(period), _queued_processes(0)
+    {
+        _out.push_back(std::make_pair(1, 1));
+    }
+    /**
+     * @brief internal function.
+     */
+    void internal() noexcept {
+        DhryStone().dhrystoneRun(_internal_cycles);
+        _queued_processes--;
+    }
+    /**
+     * @brief advance function.
+     * @return Time until next internal event.
+     */
+    TIME advance() const noexcept {
+        return (_queued_processes?_period: boost::simulation::pdevs::atomic<TIME, MSG>::infinity);
+    }
+    /**
+     * @brief out function.
+     * @return Message defined in contruction.
+     */
+    std::vector<MSG> out() const noexcept{
+        return _out;
+    }
+    /**
+     * @brief external function domain is empty, so it throws.
+     * @param msg external input message.
+     * @param t time the external input is received.
+     */
+    void external(const std::vector<MSG>& msg, const TIME& t) noexcept {
+        DhryStone().dhrystoneRun(_external_cycles);
+        _queued_processes+=msg.size();
+    }
+    /**
+     * @brief confluence function as defined in PDEVS
+     * Message interpretation (with cdpp::message_cast) is confluence function responsability.
+     * @param mb is a bag of messages coming from outside
+     * @param t is the time the message is received
+     */
+    void confluence(const std::vector<MSG>& mb, const TIME& t) noexcept{
+        internal();
+        external(mb, TIME(0));
+    }
+
+};
+
+}
+
+#endif // P_DEVSTONE_ATOMIC_PAIR_H

simulators/cadmium_cdboost/src/cdboost-devstone-filter.hpp

@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2013-2014, Carleton University, Universite de Nice-Sophia Antipolis
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef P_DEVSTONE_FILTER_H
+#define P_DEVSTONE_FILTER_H
+
+#include <boost/simulation/pdevs/atomic.hpp>
+
+namespace cdpp {
+/**
+ * @brief PDEVStone Atomic Model.
+ *
+ * PDEVStone (InternalTime, ExternalTime, Period):
+ * This model executes:
+ * - a Dhrystone for InternalCycles on each Internal transition,
+ * - a Dhrystone for ExternalCycles on each External transition,
+ * - the time advance after each external transition is Period.
+*/
+template<class TIME, class MSG>
+class PDEVStoneFilter : public boost::simulation::pdevs::atomic<TIME, MSG>
+{
+    std::vector<MSG> _out;
+    TIME _period;
+    int _reference;
+    int _state;  // 0 passive, 1 active
+public:
+    /**
+     * @brief DEVStoneAtomic constructor.
+     *
+     * @param internal_cycles the cycles dhrystone will be run in internal transitions.
+     * @param external_cycles the cycles dhrystone will be run in external transitions.
+     * @param period the time used for all time_advances.
+     */
+    explicit PDEVStoneFilter(int reference,  TIME period)
+        : _period(period), _reference(reference)
+    {
+        _state = 0;
+    }
+    /**
+     * @brief internal function.
+     */
+    void internal() noexcept {
+        _state = 0;
+    }
+    /**
+     * @brief advance function.
+     * @return Time until next internal event.
+     */
+    TIME advance() const noexcept {
+        return ((_state==1)? 0 : boost::simulation::pdevs::atomic<TIME, MSG>::infinity);
+    }
+    /**
+     * @brief out function.
+     * @return Message defined in contruction.
+     */
+    std::vector<MSG> out() const noexcept{
+        return _out;
+    }
+    /**
+     * @brief external function domain is empty, so it throws.
+     * @param msg external input message.
+     * @param t time the external input is received.
+     */
+    void external(const std::vector<MSG>& msg, const TIME& t) noexcept {
+        for(std::pair<int, int> m: msg) {
+            if(m.first == _reference) {
+                _out.push_back(m);
+            }
+        }
+
+        if(_out.size() != 0) _state = 1;
+    }
+    /**
+     * @brief confluence function as defined in PDEVS
+     * Message interpretation (with cdpp::message_cast) is confluence function responsability.
+     * @param mb is a bag of messages coming from outside
+     * @param t is the time the message is received
+     */
+    void confluence(const std::vector<MSG>& mb, const TIME& t) noexcept{
+        internal();
+        external(mb, TIME(0));
+    }
+
+};
+
+}
+
+#endif // P_DEVSTONE_FILTER_H

simulators/cadmium_cdboost/src/cdboost-devstone-input-stream-pair.hpp

@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2013-2014, Carleton University, Universite de Nice-Sophia Antipolis
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef P_DEVSTONE_INPUT_STREAM_PAIR_H
+#define P_DEVSTONE_INPUT_STREAM_PAIR_H
+
+#include <istream>
+#include <sstream>
+#include <boost/simulation/pdevs/atomic.hpp>
+
+using namespace boost::simulation::pdevs;
+
+namespace cdpp {
+/**
+ * @brief input_stream PDEVS Model.
+ *
+ * istream PDEVS Model plays a history of events received by an input stream.
+ * The list of events allows to be used as a connector to external tools.
+ * The input format is "time output and a custom parser can be defined."
+ *
+*/
+template<class TIME, class MSG>
+class devstone_input_stream_pair : public boost::simulation::pdevs::atomic<TIME, MSG>
+{
+    std::vector<MSG> _out;
+    TIME _period;
+    int _state;  // 0 passive, 1 active
+public:
+    /**
+     * @brief DEVStoneAtomic constructor.
+     *
+     * @param internal_cycles the cycles dhrystone will be run in internal transitions.
+     * @param external_cycles the cycles dhrystone will be run in external transitions.
+     * @param period the time used for all time_advances.
+     */
+    explicit devstone_input_stream_pair(TIME period)
+            : _period(period)
+    {
+        _state = 1;
+        _out.push_back(std::make_pair(0, 0));
+        _out.push_back(std::make_pair(1, 0));
+    }
+    /**
+     * @brief internal function.
+     */
+    void internal() noexcept {
+        _state = 0;
+    }
+    /**
+     * @brief advance function.
+     * @return Time until next internal event.
+     */
+    TIME advance() const noexcept {
+        return ((_state==1)? 0 : boost::simulation::pdevs::atomic<TIME, MSG>::infinity);
+    }
+    /**
+     * @brief out function.
+     * @return Message defined in contruction.
+     */
+    std::vector<MSG> out() const noexcept{
+        return _out;
+    }
+    /**
+     * @brief external function domain is empty, so it throws.
+     * @param msg external input message.
+     * @param t time the external input is received.
+     */
+    void external(const std::vector<MSG>& msg, const TIME& t) noexcept {
+
+    }
+    /**
+     * @brief confluence function as defined in PDEVS
+     * Message interpretation (with cdpp::message_cast) is confluence function responsability.
+     * @param mb is a bag of messages coming from outside
+     * @param t is the time the message is received
+     */
+    void confluence(const std::vector<MSG>& mb, const TIME& t) noexcept{
+        internal();
+        external(mb, TIME(0));
+    }
+
+};
+
+}
+
+#endif // P_DEVSTONE_INPUT_STREAM_PAIR_H

simulators/cadmium_cdboost/src/cdboost-devstone.cpp

@@ -30,6 +30,9 @@
 #include <boost/program_options.hpp>
 #include <boost/simulation.hpp>
 #include "cdboost-devstone-atomic.hpp"
+#include "cdboost-devstone-atomic-pair.hpp"
+#include "cdboost-devstone-filter.hpp"
+#include "cdboost-devstone-input-stream-pair.hpp"
 
 using namespace std;
 using namespace cdpp;
@@ -38,15 +41,16 @@ using hclock=chrono::high_resolution_clock;
 using Time=double;
 //const float infinity = std::numeric_limits<double>::infinity();
 inline bool is_infinity(double& f ){ return isinf(f); }
-using msg_type=int;
+using msg_type_int=int;
+using msg_type_pair=std::pair<int, int>;
 
-shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> LI_coupling(int& counted_atomic_models, int& counted_coupled_models,
+shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> LI_coupling(int& counted_atomic_models, int& counted_coupled_models,
                            int width, int depth, string event_list, int ext_cycles, int int_cycles, int time_advance)
 {
-    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> cm;
-    auto first_pdevstone = boost::simulation::make_atomic_ptr<PDEVStoneAtomic<Time, msg_type>, int, int, Time>(int_cycles, ext_cycles, Time(time_advance));
+    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> cm;
+    auto first_pdevstone = boost::simulation::make_atomic_ptr<PDEVStoneAtomic<Time, msg_type_int>, int, int, Time>(int_cycles, ext_cycles, Time(time_advance));
     counted_atomic_models++;
-    cm.reset(new boost::simulation::pdevs::coupled<Time, msg_type>{{first_pdevstone}, {first_pdevstone}, {}, {first_pdevstone}});
+    cm.reset(new boost::simulation::pdevs::coupled<Time, msg_type_int>{{first_pdevstone}, {first_pdevstone}, {}, {first_pdevstone}});
     counted_coupled_models++;
 
     //connect higher level models
@@ -60,7 +64,7 @@ shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> LI_coupling(int& c
         eic_cm.clear();
         eoc_cm.push_back(cm);
         for (int j=0; j < width-1; j++){
-            auto current = (std::shared_ptr<boost::simulation::model<Time>>) std::make_shared<cdpp::PDEVStoneAtomic<Time, msg_type>>(int_cycles, ext_cycles, Time(time_advance));
+            auto current = (std::shared_ptr<boost::simulation::model<Time>>) std::make_shared<cdpp::PDEVStoneAtomic<Time, msg_type_int>>(int_cycles, ext_cycles, Time(time_advance));
             vpdt.push_back(current);
             counted_atomic_models++;
             eic_cm.push_back(current);
@@ -68,28 +72,28 @@ shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> LI_coupling(int& c
         vpdt.push_back(cm);
         eic_cm.push_back(cm);
 
-        shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> cm_int ( new boost::simulation::pdevs::coupled<Time, msg_type>{vpdt, eic_cm, {}, eoc_cm});
+        shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> cm_int ( new boost::simulation::pdevs::coupled<Time, msg_type_int>{vpdt, eic_cm, {}, eoc_cm});
         counted_coupled_models++;
         cm=cm_int;
     }
 
     //Plug the input events
     shared_ptr<istream> piss{ new ifstream{event_list} };
-    auto pf = boost::simulation::make_atomic_ptr<boost::simulation::pdevs::basic_models::input_stream<Time, msg_type, int, int>, shared_ptr<istream>, Time>(piss, Time{0});
+    auto pf = boost::simulation::make_atomic_ptr<boost::simulation::pdevs::basic_models::input_stream<Time, msg_type_int, int, int>, shared_ptr<istream>, Time>(piss, Time{0});
     counted_atomic_models++;
 
-    auto root = std::make_shared<boost::simulation::pdevs::coupled<Time, msg_type>>(boost::simulation::pdevs::coupled<Time, msg_type>({pf, cm}, {}, {{pf, cm}}, {cm}));
+    auto root = std::make_shared<boost::simulation::pdevs::coupled<Time, msg_type_int>>(boost::simulation::pdevs::coupled<Time, msg_type_int>({pf, cm}, {}, {{pf, cm}}, {cm}));
     counted_coupled_models++;
     return root;
 }
 
-shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> HI_coupling(int& counted_atomic_models, int& counted_coupled_models,
+shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> HI_coupling(int& counted_atomic_models, int& counted_coupled_models,
                            int width, int depth, string event_list, int ext_cycles, int int_cycles, int time_advance)
 {
-    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> cm;
-    auto first_pdevstone = boost::simulation::make_atomic_ptr<PDEVStoneAtomic<Time, msg_type>, int, int, Time>(int_cycles, ext_cycles, Time(time_advance));
+    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> cm;
+    auto first_pdevstone = boost::simulation::make_atomic_ptr<PDEVStoneAtomic<Time, msg_type_int>, int, int, Time>(int_cycles, ext_cycles, Time(time_advance));
     counted_atomic_models++;
-    cm.reset(new boost::simulation::pdevs::coupled<Time, msg_type>{{first_pdevstone}, {first_pdevstone}, {}, {first_pdevstone}});
+    cm.reset(new boost::simulation::pdevs::coupled<Time, msg_type_int>{{first_pdevstone}, {first_pdevstone}, {}, {first_pdevstone}});
     counted_coupled_models++;
 
     //connect higher level models
@@ -105,7 +109,7 @@ shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> HI_coupling(int& c
         ic_cm.clear();
         eoc_cm.push_back(cm);
         for (int j=0; j < width-1; j++){
-            std::shared_ptr<boost::simulation::model<Time>> current = std::shared_ptr<boost::simulation::model<Time>>(make_shared<PDEVStoneAtomic<Time, msg_type>>(int_cycles, ext_cycles, Time(time_advance)));
+            std::shared_ptr<boost::simulation::model<Time>> current = std::shared_ptr<boost::simulation::model<Time>>(make_shared<PDEVStoneAtomic<Time, msg_type_int>>(int_cycles, ext_cycles, Time(time_advance)));
             if (j > 0) ic_cm.push_back({vpdt.back(), current});
             vpdt.push_back(current);
             counted_atomic_models++;
@@ -114,24 +118,81 @@ shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> HI_coupling(int& c
         vpdt.push_back(cm);
         eic_cm.push_back(cm);
 
-        shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> cm_int ( new boost::simulation::pdevs::coupled<Time, msg_type>{vpdt, eic_cm, ic_cm, eoc_cm});
+        shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> cm_int ( new boost::simulation::pdevs::coupled<Time, msg_type_int>{vpdt, eic_cm, ic_cm, eoc_cm});
         counted_coupled_models++;
         cm=cm_int;
     }
 
     //Plug the input events
     shared_ptr<istream> piss{ new ifstream{event_list} };
-    auto pf = boost::simulation::make_atomic_ptr<boost::simulation::pdevs::basic_models::input_stream<Time, msg_type, int, int>, shared_ptr<istream>, Time>(piss, Time{0});
+    auto pf = boost::simulation::make_atomic_ptr<boost::simulation::pdevs::basic_models::input_stream<Time, msg_type_int, int, int>, shared_ptr<istream>, Time>(piss, Time{0});
 
     counted_atomic_models++;
 
-    auto root = std::make_shared<boost::simulation::pdevs::coupled<Time, msg_type>>(boost::simulation::pdevs::coupled<Time, msg_type>({pf, cm}, {}, {{pf, cm}}, {cm}));
+    auto root = std::make_shared<boost::simulation::pdevs::coupled<Time, msg_type_int>>(boost::simulation::pdevs::coupled<Time, msg_type_int>({pf, cm}, {}, {{pf, cm}}, {cm}));
+    counted_coupled_models++;
+    return root;
+}
+
+
+shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_pair>> HO_coupling(int& counted_atomic_models, int& counted_coupled_models,
+                                                                          int width, int depth, string event_list, int ext_cycles, int int_cycles, int time_advance)
+{
+    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_pair>> cm;
+    auto first_pdevstone = boost::simulation::make_atomic_ptr<PDEVStoneAtomicPair<Time, msg_type_pair>, int, int, Time>(int_cycles, ext_cycles, Time(time_advance));
+    counted_atomic_models++;
+    cm.reset(new boost::simulation::pdevs::coupled<Time, msg_type_pair>{{first_pdevstone}, {first_pdevstone}, {}, {first_pdevstone}});
+    counted_coupled_models++;
+
+    //connect higher level models
+
+    for (int i=1; i < depth; i++){
+        auto filter0 = boost::simulation::make_atomic_ptr<PDEVStoneFilter<Time, msg_type_pair>, int, Time>(0, Time(time_advance));   // in
+        auto filter1 = boost::simulation::make_atomic_ptr<PDEVStoneFilter<Time, msg_type_pair>, int, Time>(1, Time(time_advance));   // in2
+        counted_atomic_models+=2;
+        vector<std::shared_ptr<boost::simulation::model<Time>>> vpdt;
+        vector<std::shared_ptr<boost::simulation::model<Time>>> eoc_cm;
+        vector<std::shared_ptr<boost::simulation::model<Time>>> eic_cm;
+        vector<pair<std::shared_ptr<boost::simulation::model<Time>>, std::shared_ptr<boost::simulation::model<Time>>>> ic_cm;
+        vpdt.clear();
+        eoc_cm.clear();
+        eic_cm.clear();
+        ic_cm.clear();
+        eoc_cm.push_back(cm);
+        eic_cm.push_back(filter0);
+        eic_cm.push_back(filter1);
+        for (int j=0; j < width-1; j++){
+            std::shared_ptr<boost::simulation::model<Time>> current = std::shared_ptr<boost::simulation::model<Time>>(make_shared<PDEVStoneAtomicPair<Time, msg_type_pair>>(int_cycles, ext_cycles, Time(time_advance)));
+            if (j > 0) ic_cm.push_back({vpdt.back(), current});
+            vpdt.push_back(current);
+            counted_atomic_models++;
+            //eic_cm.push_back(current);
+            ic_cm.push_back({filter1, current});
+            eoc_cm.push_back(current);
+        }
+        vpdt.push_back(cm);
+        vpdt.push_back(filter0);
+        vpdt.push_back(filter1);
+        //eic_cm.push_back(cm);
+        ic_cm.push_back({filter0, cm});
+
+        shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_pair>> cm_int ( new boost::simulation::pdevs::coupled<Time, msg_type_pair>{vpdt, eic_cm, ic_cm, eoc_cm});
+        counted_coupled_models++;
+        cm=cm_int;
+    }
+
+    //Plug the input events
+    auto gen = boost::simulation::make_atomic_ptr<devstone_input_stream_pair<Time, msg_type_pair>, Time>(Time(time_advance));
+    counted_atomic_models++;
+
+    auto root = std::make_shared<boost::simulation::pdevs::coupled<Time, msg_type_pair>>(boost::simulation::pdevs::coupled<Time, msg_type_pair>({gen, cm}, {}, {{gen, cm}}, {cm}));
     counted_coupled_models++;
     return root;
 }
 
 
 
+
 int main(int argc, char* argv[]){
     auto start = hclock::now();
 
@@ -196,23 +257,30 @@ int main(int argc, char* argv[]){
     int counted_coupled_models=0;
 
 
-    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type>> root;
+    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_int>> root_int;
+    shared_ptr<boost::simulation::pdevs::coupled<Time, msg_type_pair>> root_pair;
     if (kind.compare("LI") == 0){
-        root = LI_coupling(counted_atomic_models, counted_coupled_models, width, depth, event_list, ext_cycles, int_cycles, time_advance);
+        root_int = LI_coupling(counted_atomic_models, counted_coupled_models, width, depth, event_list, ext_cycles, int_cycles, time_advance);
     } else if (kind.compare("HI") == 0){
-        root = HI_coupling(counted_atomic_models, counted_coupled_models, width, depth, event_list, ext_cycles, int_cycles, time_advance);
+        root_int = HI_coupling(counted_atomic_models, counted_coupled_models, width, depth, event_list, ext_cycles, int_cycles, time_advance);
+    } else if (kind.compare("HO") == 0){
+        root_pair = HO_coupling(counted_atomic_models, counted_coupled_models, width, depth, event_list, ext_cycles, int_cycles, time_advance);
     } else {
         abort();
     }
 
     auto model_built = hclock::now();
-
+    std::chrono::_V2::system_clock::time_point model_init;
     //run the model
-    boost::simulation::pdevs::runner<Time, msg_type> r(root, Time{0});
-
-    auto model_init = hclock::now();
-
-    r.runUntilPassivate();
+    if (kind.compare("LI") == 0 || kind.compare("HI") == 0) {
+        boost::simulation::pdevs::runner<Time, msg_type_int> r(root_int, Time{0});
+        model_init = hclock::now();
+        r.runUntilPassivate();
+    } else {  // HO or HOmod
+        boost::simulation::pdevs::runner<Time, msg_type_pair> r(root_pair, Time{0});
+        model_init = hclock::now();
+        r.runUntilPassivate();
+    }
 
     auto finished_simulation = hclock::now();