diff --git a/trunk/paradiseo-old-mo/CMakeLists.txt b/trunk/paradiseo-old-mo/CMakeLists.txt index 99a7232bd..0159b524f 100644 --- a/trunk/paradiseo-old-mo/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/CMakeLists.txt @@ -14,11 +14,11 @@ INCLUDE(mo-conf.cmake OPTIONAL) ########################################################################################################################################## # set the project name -PROJECT(ParadisEO-MO) +PROJECT(ParadisEO-OLD-MO) SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE) -SET(PACKAGE_NAME "ParadisEO-MO - Moving Objects" CACHE STRING "Package name" FORCE) -SET(PACKAGE_STRING "ParadisEO-MO 1.2" CACHE STRING "MO Package string full name" FORCE) +SET(PACKAGE_NAME "ParadisEO-OLD-MO - Moving Objects" CACHE STRING "Package name" FORCE) +SET(PACKAGE_STRING "ParadisEO-OLD-MO 1.2" CACHE STRING "MO Package string full name" FORCE) SET(PACKAGE_VERSION "1.2" CACHE STRING "Package version" FORCE) SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE) SET(VERSION "1.2" CACHE STRING "Version" FORCE) diff --git a/trunk/paradiseo-old-mo/doc/CMakeLists.txt b/trunk/paradiseo-old-mo/doc/CMakeLists.txt index 8963a9ba5..501222f98 100755 --- a/trunk/paradiseo-old-mo/doc/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/doc/CMakeLists.txt @@ -1,4 +1,3 @@ - ########################################################################################## ### MO Doc generation using Doxygen ########################################################################################## @@ -6,18 +5,18 @@ IF (DOXYGEN_FOUND) SET(DOC_DIR ${CMAKE_BINARY_DIR}/doc CACHE PATH "MO documentation directory") - SET(MO_DOC_CONFIG_FILE "mo.doxyfile" CACHE PATH "MO documentation configuration file") + SET(OLDMO_DOC_CONFIG_FILE "mo.doxyfile" CACHE PATH "MO documentation configuration file") # define the doc target IF (DOXYGEN_EXECUTABLE) ADD_CUSTOM_TARGET(doc - COMMAND ${DOXYGEN_EXECUTABLE} ${MO_DOC_CONFIG_FILE} + COMMAND ${DOXYGEN_EXECUTABLE} ${OLDMO_DOC_CONFIG_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) ENDIF (DOXYGEN_EXECUTABLE) # configure doxyfile file - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${MO_DOC_CONFIG_FILE}.cmake" - "${CMAKE_BINARY_DIR}/doc/${MO_DOC_CONFIG_FILE}") + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}.cmake" + "${CMAKE_BINARY_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}") ELSE (DOXYGEN_FOUND) MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found") diff --git a/trunk/paradiseo-old-mo/src/CMakeLists.txt b/trunk/paradiseo-old-mo/src/CMakeLists.txt index 4ce15020e..d41d4587a 100644 --- a/trunk/paradiseo-old-mo/src/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/src/CMakeLists.txt @@ -1,4 +1,3 @@ - ############################################################### # This is a dummy file ############################################################### diff --git a/trunk/paradiseo-old-mo/test/CMakeLists.txt b/trunk/paradiseo-old-mo/test/CMakeLists.txt index 4a98f0f7a..69254c582 100644 --- a/trunk/paradiseo-old-mo/test/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/test/CMakeLists.txt @@ -10,7 +10,7 @@ ###################################################################################### INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) -INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ### 2) Specify where CMake can find the libraries ###################################################################################### -LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-MO_BINARY_DIR}/lib) +LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${OLDMO_BIN_DIR}/lib) ###################################################################################### diff --git a/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp b/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp index 63a05902a..55331d272 100644 --- a/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp +++ b/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp b/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp index ba3b36af4..ab415a747 100644 --- a/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp +++ b/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp b/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp index 59dc5b696..c8089e223 100644 --- a/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp +++ b/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp b/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp index 6214a73b0..2290dc67b 100644 --- a/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp +++ b/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp b/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp index 367f274f3..23b9d1e20 100644 --- a/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp +++ b/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp b/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp index d648945d4..916988492 100644 --- a/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp +++ b/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moHC.cpp b/trunk/paradiseo-old-mo/test/t-moHC.cpp index bbcb90b55..e8fe505ec 100644 --- a/trunk/paradiseo-old-mo/test/t-moHC.cpp +++ b/trunk/paradiseo-old-mo/test/t-moHC.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp b/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp index 73de0ac85..9d431a071 100644 --- a/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp +++ b/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moHC_2.cpp b/trunk/paradiseo-old-mo/test/t-moHC_2.cpp index eecc80e60..df0b57d34 100644 --- a/trunk/paradiseo-old-mo/test/t-moHC_2.cpp +++ b/trunk/paradiseo-old-mo/test/t-moHC_2.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moILS.cpp b/trunk/paradiseo-old-mo/test/t-moILS.cpp index bf8d75a87..ec5f211ca 100644 --- a/trunk/paradiseo-old-mo/test/t-moILS.cpp +++ b/trunk/paradiseo-old-mo/test/t-moILS.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp b/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp index 98bf88cf0..3dbca1ecb 100644 --- a/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp +++ b/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp b/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp index 4cbd940c6..1df643357 100644 --- a/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp +++ b/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp b/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp index dc6c3f296..e09b89262 100644 --- a/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp +++ b/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp b/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp index 121cc681a..fe642ef51 100644 --- a/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp +++ b/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp b/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp index dbd5acffa..b04c485ca 100644 --- a/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp +++ b/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp b/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp index 190f92e9b..611efed94 100644 --- a/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp +++ b/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp b/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp index 76d264da2..02588ee8a 100644 --- a/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp +++ b/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp b/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp index 2fe273f43..61961b207 100644 --- a/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp +++ b/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp b/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp index 653b39b61..a8dabffe8 100644 --- a/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp +++ b/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp b/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp index e44fe1039..97d576df4 100644 --- a/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp +++ b/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moSA.cpp b/trunk/paradiseo-old-mo/test/t-moSA.cpp index 6a0d117f0..0c8ad4477 100644 --- a/trunk/paradiseo-old-mo/test/t-moSA.cpp +++ b/trunk/paradiseo-old-mo/test/t-moSA.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp b/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp index e9937bdac..d77e6e969 100644 --- a/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp +++ b/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp b/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp index 85d63a5cb..6d778b767 100644 --- a/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp +++ b/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp b/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp index d70630102..ee655c430 100644 --- a/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp +++ b/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moTA.cpp b/trunk/paradiseo-old-mo/test/t-moTA.cpp index 2bfd91e2b..661baff80 100644 --- a/trunk/paradiseo-old-mo/test/t-moTA.cpp +++ b/trunk/paradiseo-old-mo/test/t-moTA.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moTS.cpp b/trunk/paradiseo-old-mo/test/t-moTS.cpp index 96908ef27..9748f621d 100644 --- a/trunk/paradiseo-old-mo/test/t-moTS.cpp +++ b/trunk/paradiseo-old-mo/test/t-moTS.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp b/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp index 75aaaeebc..8dd033878 100644 --- a/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp +++ b/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moTS_2.cpp b/trunk/paradiseo-old-mo/test/t-moTS_2.cpp index eebaa532b..b3917a28c 100644 --- a/trunk/paradiseo-old-mo/test/t-moTS_2.cpp +++ b/trunk/paradiseo-old-mo/test/t-moTS_2.cpp @@ -38,7 +38,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO using std::cout; using std::endl; diff --git a/trunk/paradiseo-old-mo/test/t-moVNS.cpp b/trunk/paradiseo-old-mo/test/t-moVNS.cpp index 36fadfca0..03e74aa52 100644 --- a/trunk/paradiseo-old-mo/test/t-moVNS.cpp +++ b/trunk/paradiseo-old-mo/test/t-moVNS.cpp @@ -39,7 +39,7 @@ //----------------------------------------------------------------------------- #include // EO -#include // MO +#include // MO #include using std::cout; diff --git a/trunk/paradiseo-old-mo/tutorial/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/CMakeLists.txt index 6b1468059..a0ef58ab1 100644 --- a/trunk/paradiseo-old-mo/tutorial/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/CMakeLists.txt @@ -5,11 +5,11 @@ ENDIF(COMMAND cmake_policy) ### 1) Definitions (required for tsp target) ###################################################################################### -SET(TSP_SRC_DIR ${MO_SRC_DIR}/tutorial/examples/tsp CACHE PATH "TSP src directory") -SET(TSP_BIN_DIR ${MO_BIN_DIR}/tutorial/examples/tsp CACHE PATH "TSP binary directory") +SET(TSP_SRC_DIR ${OLDMO_SRC_DIR}/tutorial/examples/tsp CACHE PATH "TSP src directory") +SET(TSP_BIN_DIR ${OLDMO_BIN_DIR}/tutorial/examples/tsp CACHE PATH "TSP binary directory") -SET(FUNCTION_SRC_DIR ${MO_SRC_DIR}/tutorial/examples/function CACHE PATH "FUNCTION src directory") -SET(FUNCTION_BIN_DIR ${MO_BIN_DIR}/tutorial/examples/function CACHE PATH "FUNCTION binary directory") +SET(FUNCTION_SRC_DIR ${OLDMO_SRC_DIR}/tutorial/examples/function CACHE PATH "FUNCTION src directory") +SET(FUNCTION_BIN_DIR ${OLDMO_BIN_DIR}/tutorial/examples/function CACHE PATH "FUNCTION binary directory") ###################################################################################### @@ -29,29 +29,29 @@ IF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CM FOREACH (bench ${BENCH_LIST}) EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/${bench} - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/${bench} + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/${bench} + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/${bench} ) ENDFOREACH (bench) EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson1/param + ${OLDMO_SRC_DIR}/tutorial/Lesson1/param + ${OLDMO_BIN_DIR}/tutorial/Lesson1/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson2/param + ${OLDMO_SRC_DIR}/tutorial/Lesson2/param + ${OLDMO_BIN_DIR}/tutorial/Lesson2/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson3/param + ${OLDMO_SRC_DIR}/tutorial/Lesson3/param + ${OLDMO_BIN_DIR}/tutorial/Lesson3/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson4/param + ${OLDMO_SRC_DIR}/tutorial/Lesson4/param + ${OLDMO_BIN_DIR}/tutorial/Lesson4/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson5/param + ${OLDMO_SRC_DIR}/tutorial/Lesson5/param + ${OLDMO_BIN_DIR}/tutorial/Lesson5/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/HybridLesson/param - ${MO_BIN_DIR}/tutorial/HybridLesson/param + ${OLDMO_SRC_DIR}/tutorial/HybridLesson/param + ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param ) ENDIF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") @@ -59,158 +59,158 @@ ENDIF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR ### 3) Where must cmake go now ? ###################################################################################### -MACRO(ADD_COMMANDS_MO) +MACRO(ADD_COMMANDS_OLDMO) ADD_CUSTOM_COMMAND( OUTPUT - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson1/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson1 + ${OLDMO_SRC_DIR}/tutorial/Lesson1/param + ${OLDMO_BIN_DIR}/tutorial/Lesson1 ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson2/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson2/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson2 + ${OLDMO_SRC_DIR}/tutorial/Lesson2/param + ${OLDMO_BIN_DIR}/tutorial/Lesson2 ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson3/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson3/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson3 + ${OLDMO_SRC_DIR}/tutorial/Lesson3/param + ${OLDMO_BIN_DIR}/tutorial/Lesson3 ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson4/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson4/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson4 + ${OLDMO_SRC_DIR}/tutorial/Lesson4/param + ${OLDMO_BIN_DIR}/tutorial/Lesson4 ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson5/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson5/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson5 + ${OLDMO_SRC_DIR}/tutorial/Lesson5/param + ${OLDMO_BIN_DIR}/tutorial/Lesson5 ) ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param + OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson6/param COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/HybridLesson/param - ${MO_BIN_DIR}/tutorial/HybridLesson + ${OLDMO_SRC_DIR}/tutorial/HybridLesson/param + ${OLDMO_BIN_DIR}/tutorial/HybridLesson ) -ENDMACRO(ADD_COMMANDS_MO) +ENDMACRO(ADD_COMMANDS_OLDMO) -MACRO(ADD_TARGET_MO n) +MACRO(ADD_TARGET_OLDMO n) IF(${n} STREQUAL "lesson1") ADD_CUSTOM_TARGET(lesson1 DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson1/hill_climbing - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/Lesson1/param + ${OLDMO_BIN_DIR}/tutorial/Lesson1/hill_climbing + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "lesson2") ADD_CUSTOM_TARGET(lesson2 DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson2/tabu_search - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/Lesson2/param + ${OLDMO_BIN_DIR}/tutorial/Lesson2/tabu_search + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "lesson3") ADD_CUSTOM_TARGET(lesson3 DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson3/simulated_annealing - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDOLDMO_BIN_DIR}/tutorial/Lesson3/param + ${OLDMO_BIN_DIR}/tutorial/Lesson3/simulated_annealing + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "lesson4") ADD_CUSTOM_TARGET(lesson4 DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson4/iterated_local_search - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/Lesson4/param + ${OLDMO_BIN_DIR}/tutorial/Lesson4/iterated_local_search + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "lesson5") ADD_CUSTOM_TARGET(lesson5 DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson5/variable_neighborhood_search - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/Lesson5/param + ${OLDMO_BIN_DIR}/tutorial/Lesson5/variable_neighborhood_search + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "hybridlesson") ADD_CUSTOM_TARGET(hybridlesson DEPENDS - ${MO_BIN_DIR}/tutorial/HybridLesson/param - ${MO_BIN_DIR}/tutorial/HybridLesson/hybrid_ga - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param + ${OLDMO_BIN_DIR}/tutorial/HybridLesson/hybrid_ga + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "install") ADD_CUSTOM_TARGET(install DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/HybridLesson/param - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/Lesson1/param + ${OLDMO_BIN_DIR}/tutorial/Lesson2/param + ${OLDMO_BIN_DIR}/tutorial/Lesson3/param + ${OLDMO_BIN_DIR}/tutorial/Lesson4/param + ${OLDMO_BIN_DIR}/tutorial/Lesson5/param + ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ELSEIF(${n} STREQUAL "benchs") ADD_CUSTOM_TARGET(benchs DEPENDS - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ENDIF(${n} STREQUAL "lesson1") -ENDMACRO(ADD_TARGET_MO) +ENDMACRO(ADD_TARGET_OLDMO) IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(install) - ADD_TARGET_MO(benchs) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(install) + ADD_TARGET_OLDMO(benchs) ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ADD_SUBDIRECTORY(examples) diff --git a/trunk/paradiseo-old-mo/tutorial/HybridLesson/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/HybridLesson/CMakeLists.txt index 31bdbf4e4..0e7929fa1 100644 --- a/trunk/paradiseo-old-mo/tutorial/HybridLesson/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/HybridLesson/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp - ${MO_BIN_DIR}/tutorial/HybridLesson/param + ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson6) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson6) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/HybridLesson/hybrid_ga.cpp b/trunk/paradiseo-old-mo/tutorial/HybridLesson/hybrid_ga.cpp index 35670ab9b..6c8e464e1 100644 --- a/trunk/paradiseo-old-mo/tutorial/HybridLesson/hybrid_ga.cpp +++ b/trunk/paradiseo-old-mo/tutorial/HybridLesson/hybrid_ga.cpp @@ -35,7 +35,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/Lesson1/CMakeLists.txt index 3f018e4ee..e2664035a 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson1/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/Lesson1/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(hill_climbing hill_climbing.cpp - ${MO_BIN_DIR}/tutorial/Lesson1/param + ${OLDMO_BIN_DIR}/tutorial/Lesson1/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson1) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson1) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson1/hill_climbing.cpp b/trunk/paradiseo-old-mo/tutorial/Lesson1/hill_climbing.cpp index 94fc3ae34..9727c891c 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson1/hill_climbing.cpp +++ b/trunk/paradiseo-old-mo/tutorial/Lesson1/hill_climbing.cpp @@ -34,7 +34,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/Lesson2/CMakeLists.txt index 0f240ebd3..bbb81ee2d 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson2/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/Lesson2/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(tabu_search tabu_search.cpp - ${MO_BIN_DIR}/tutorial/Lesson2/param + ${OLDMO_BIN_DIR}/tutorial/Lesson2/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson2) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson2) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(tabu_search tabu_search.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-old-mo/tutorial/Lesson2/tabu_search.cpp index ce67cbbec..579d66f10 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-old-mo/tutorial/Lesson2/tabu_search.cpp @@ -35,7 +35,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/Lesson3/CMakeLists.txt index 41e048ef4..b3400243f 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson3/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/Lesson3/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp - ${MO_BIN_DIR}/tutorial/Lesson3/param + ${OLDMO_BIN_DIR}/tutorial/Lesson3/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson3) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson3) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-old-mo/tutorial/Lesson3/simulated_annealing.cpp index 0905b3590..13f149013 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson3/simulated_annealing.cpp +++ b/trunk/paradiseo-old-mo/tutorial/Lesson3/simulated_annealing.cpp @@ -34,7 +34,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/Lesson4/CMakeLists.txt index a8435bd79..f9d98c34d 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson4/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/Lesson4/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp - ${MO_BIN_DIR}/tutorial/Lesson4/param + ${OLDMO_BIN_DIR}/tutorial/Lesson4/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson4) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson4) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson4/iterated_local_search.cpp b/trunk/paradiseo-old-mo/tutorial/Lesson4/iterated_local_search.cpp index 8d8b42324..b3293c610 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson4/iterated_local_search.cpp +++ b/trunk/paradiseo-old-mo/tutorial/Lesson4/iterated_local_search.cpp @@ -34,7 +34,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson5/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/Lesson5/CMakeLists.txt index 7d4f0797d..8ca8b9b5c 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson5/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/Lesson5/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) ###################################################################################### @@ -30,7 +30,7 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ADD_EXECUTABLE(variable_neighborhood_search variable_neighborhood_search.cpp - ${MO_BIN_DIR}/tutorial/Lesson5/param + ${OLDMO_BIN_DIR}/tutorial/Lesson5/param ${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp @@ -38,8 +38,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS_MO() - ADD_TARGET_MO(lesson5) + ADD_COMMANDS_OLDMO() + ADD_TARGET_OLDMO(lesson5) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(variable_neighborhood_search variable_neighborhood_search.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/trunk/paradiseo-old-mo/tutorial/Lesson5/variable_neighborhood_search.cpp b/trunk/paradiseo-old-mo/tutorial/Lesson5/variable_neighborhood_search.cpp index c03eaf256..561a23725 100644 --- a/trunk/paradiseo-old-mo/tutorial/Lesson5/variable_neighborhood_search.cpp +++ b/trunk/paradiseo-old-mo/tutorial/Lesson5/variable_neighborhood_search.cpp @@ -34,7 +34,7 @@ */ #include -#include +#include #include #include diff --git a/trunk/paradiseo-old-mo/tutorial/OldLesson/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/OldLesson/CMakeLists.txt index ca24b6c37..3f9a52ab7 100644 --- a/trunk/paradiseo-old-mo/tutorial/OldLesson/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/OldLesson/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR}) ###################################################################################### diff --git a/trunk/paradiseo-old-mo/tutorial/OldLesson/minimize_function.cpp b/trunk/paradiseo-old-mo/tutorial/OldLesson/minimize_function.cpp index c69acd9f8..ca73c5ab2 100644 --- a/trunk/paradiseo-old-mo/tutorial/OldLesson/minimize_function.cpp +++ b/trunk/paradiseo-old-mo/tutorial/OldLesson/minimize_function.cpp @@ -34,7 +34,7 @@ */ #include -#include +#include #include void manage_configuration_file(eoParser & _parser); diff --git a/trunk/paradiseo-old-mo/tutorial/examples/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/examples/CMakeLists.txt index 4e30cc193..d9b5e13c8 100644 --- a/trunk/paradiseo-old-mo/tutorial/examples/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/examples/CMakeLists.txt @@ -1,5 +1,3 @@ - - ###################################################################################### ### 1) Where must cmake go now ? ###################################################################################### diff --git a/trunk/paradiseo-old-mo/tutorial/examples/function/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/examples/function/CMakeLists.txt index c7c61e3c1..ba209c1aa 100644 --- a/trunk/paradiseo-old-mo/tutorial/examples/function/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/examples/function/CMakeLists.txt @@ -3,7 +3,7 @@ ###################################################################################### INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) ###################################################################################### diff --git a/trunk/paradiseo-old-mo/tutorial/examples/tsp/CMakeLists.txt b/trunk/paradiseo-old-mo/tutorial/examples/tsp/CMakeLists.txt index 46f666724..17f5c2ac4 100755 --- a/trunk/paradiseo-old-mo/tutorial/examples/tsp/CMakeLists.txt +++ b/trunk/paradiseo-old-mo/tutorial/examples/tsp/CMakeLists.txt @@ -3,7 +3,7 @@ ###################################################################################### INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src) ######################################################################################