nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config cmake modified

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1718 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-03-25 11:18:35 +00:00
commit b49f2cdc9f
51 changed files with 188 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/paradiseo-old-mo/CMakeLists.txt
View file

@ -14,11 +14,11 @@ INCLUDE(mo-conf.cmake OPTIONAL)
########################################################################################################################################## ##########################################################################################################################################
# set the project name # 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_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_NAME "ParadisEO-OLD-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_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(PACKAGE_VERSION "1.2" CACHE STRING "Package version" FORCE)
SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE) SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE)
SET(VERSION "1.2" CACHE STRING "Version" FORCE) SET(VERSION "1.2" CACHE STRING "Version" FORCE)

9
trunk/paradiseo-old-mo/doc/CMakeLists.txt
View file

@ -1,4 +1,3 @@
########################################################################################## ##########################################################################################
### MO Doc generation using Doxygen ### MO Doc generation using Doxygen
########################################################################################## ##########################################################################################
@ -6,18 +5,18 @@
IF (DOXYGEN_FOUND) IF (DOXYGEN_FOUND)
SET(DOC_DIR ${CMAKE_BINARY_DIR}/doc CACHE PATH "MO documentation directory") 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 # define the doc target
IF (DOXYGEN_EXECUTABLE) IF (DOXYGEN_EXECUTABLE)
ADD_CUSTOM_TARGET(doc ADD_CUSTOM_TARGET(doc
COMMAND ${DOXYGEN_EXECUTABLE} ${MO_DOC_CONFIG_FILE} COMMAND ${DOXYGEN_EXECUTABLE} ${OLDMO_DOC_CONFIG_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
ENDIF (DOXYGEN_EXECUTABLE) ENDIF (DOXYGEN_EXECUTABLE)
# configure doxyfile file # configure doxyfile file
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${MO_DOC_CONFIG_FILE}.cmake" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}.cmake"
"${CMAKE_BINARY_DIR}/doc/${MO_DOC_CONFIG_FILE}") "${CMAKE_BINARY_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}")
ELSE (DOXYGEN_FOUND) ELSE (DOXYGEN_FOUND)
MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found") MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found")

1
trunk/paradiseo-old-mo/src/CMakeLists.txt
View file

@ -1,4 +1,3 @@
############################################################### ###############################################################
# This is a dummy file # This is a dummy file
############################################################### ###############################################################

4
trunk/paradiseo-old-mo/test/CMakeLists.txt
View file

@ -10,7 +10,7 @@
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) 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}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
###################################################################################### ######################################################################################
@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
### 2) Specify where CMake can find the libraries ### 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)
###################################################################################### ######################################################################################

2
trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moFitComparator.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moHC.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moHC_2.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moILS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moILS_HC.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moILS_SA.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moILS_TS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moSA.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moTA.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moTS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moTS_2.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
using std::cout; using std::cout;
using std::endl; using std::endl;

2
trunk/paradiseo-old-mo/test/t-moVNS.cpp
View file

@ -39,7 +39,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <cassert> #include <cassert>
using std::cout; using std::cout;

232
trunk/paradiseo-old-mo/tutorial/CMakeLists.txt
View file

@ -5,11 +5,11 @@ ENDIF(COMMAND cmake_policy)
### 1) Definitions (required for tsp target) ### 1) Definitions (required for tsp target)
###################################################################################### ######################################################################################
SET(TSP_SRC_DIR ${MO_SRC_DIR}/tutorial/examples/tsp CACHE PATH "TSP src directory") SET(TSP_SRC_DIR ${OLDMO_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_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_SRC_DIR ${OLDMO_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_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}) FOREACH (bench ${BENCH_LIST})
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/${bench} ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/${bench}
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/${bench} ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/${bench}
) )
ENDFOREACH (bench) ENDFOREACH (bench)
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/param ${OLDMO_SRC_DIR}/tutorial/Lesson1/param
${MO_BIN_DIR}/tutorial/Lesson1/param ${OLDMO_BIN_DIR}/tutorial/Lesson1/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson2/param ${OLDMO_SRC_DIR}/tutorial/Lesson2/param
${MO_BIN_DIR}/tutorial/Lesson2/param ${OLDMO_BIN_DIR}/tutorial/Lesson2/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson3/param ${OLDMO_SRC_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson3/param ${OLDMO_BIN_DIR}/tutorial/Lesson3/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson4/param ${OLDMO_SRC_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson4/param ${OLDMO_BIN_DIR}/tutorial/Lesson4/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson5/param ${OLDMO_SRC_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/Lesson5/param ${OLDMO_BIN_DIR}/tutorial/Lesson5/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/HybridLesson/param ${OLDMO_SRC_DIR}/tutorial/HybridLesson/param
${MO_BIN_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") 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 ? ### 3) Where must cmake go now ?
###################################################################################### ######################################################################################
MACRO(ADD_COMMANDS_MO) MACRO(ADD_COMMANDS_OLDMO)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT OUTPUT
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_SRC_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson1/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/param ${OLDMO_SRC_DIR}/tutorial/Lesson1/param
${MO_BIN_DIR}/tutorial/Lesson1 ${OLDMO_BIN_DIR}/tutorial/Lesson1
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson2/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson2/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson2/param ${OLDMO_SRC_DIR}/tutorial/Lesson2/param
${MO_BIN_DIR}/tutorial/Lesson2 ${OLDMO_BIN_DIR}/tutorial/Lesson2
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson3/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson3/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson3/param ${OLDMO_SRC_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson3 ${OLDMO_BIN_DIR}/tutorial/Lesson3
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson4/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson4/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson4/param ${OLDMO_SRC_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson4 ${OLDMO_BIN_DIR}/tutorial/Lesson4
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson5/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson5/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson5/param ${OLDMO_SRC_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/Lesson5 ${OLDMO_BIN_DIR}/tutorial/Lesson5
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param OUTPUT ${OLDMO_BIN_DIR}/tutorial/Lesson6/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/HybridLesson/param ${OLDMO_SRC_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/HybridLesson ${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") IF(${n} STREQUAL "lesson1")
ADD_CUSTOM_TARGET(lesson1 DEPENDS ADD_CUSTOM_TARGET(lesson1 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson1/param ${OLDMO_BIN_DIR}/tutorial/Lesson1/param
${MO_BIN_DIR}/tutorial/Lesson1/hill_climbing ${OLDMO_BIN_DIR}/tutorial/Lesson1/hill_climbing
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "lesson2") ELSEIF(${n} STREQUAL "lesson2")
ADD_CUSTOM_TARGET(lesson2 DEPENDS ADD_CUSTOM_TARGET(lesson2 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson2/param ${OLDMO_BIN_DIR}/tutorial/Lesson2/param
${MO_BIN_DIR}/tutorial/Lesson2/tabu_search ${OLDMO_BIN_DIR}/tutorial/Lesson2/tabu_search
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "lesson3") ELSEIF(${n} STREQUAL "lesson3")
ADD_CUSTOM_TARGET(lesson3 DEPENDS ADD_CUSTOM_TARGET(lesson3 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson3/param ${OLDOLDMO_BIN_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson3/simulated_annealing ${OLDMO_BIN_DIR}/tutorial/Lesson3/simulated_annealing
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "lesson4") ELSEIF(${n} STREQUAL "lesson4")
ADD_CUSTOM_TARGET(lesson4 DEPENDS ADD_CUSTOM_TARGET(lesson4 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson4/param ${OLDMO_BIN_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson4/iterated_local_search ${OLDMO_BIN_DIR}/tutorial/Lesson4/iterated_local_search
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "lesson5") ELSEIF(${n} STREQUAL "lesson5")
ADD_CUSTOM_TARGET(lesson5 DEPENDS ADD_CUSTOM_TARGET(lesson5 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson5/param ${OLDMO_BIN_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/Lesson5/variable_neighborhood_search ${OLDMO_BIN_DIR}/tutorial/Lesson5/variable_neighborhood_search
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "hybridlesson") ELSEIF(${n} STREQUAL "hybridlesson")
ADD_CUSTOM_TARGET(hybridlesson DEPENDS ADD_CUSTOM_TARGET(hybridlesson DEPENDS
${MO_BIN_DIR}/tutorial/HybridLesson/param ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/HybridLesson/hybrid_ga ${OLDMO_BIN_DIR}/tutorial/HybridLesson/hybrid_ga
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "install") ELSEIF(${n} STREQUAL "install")
ADD_CUSTOM_TARGET(install DEPENDS ADD_CUSTOM_TARGET(install DEPENDS
${MO_BIN_DIR}/tutorial/Lesson1/param ${OLDMO_BIN_DIR}/tutorial/Lesson1/param
${MO_BIN_DIR}/tutorial/Lesson2/param ${OLDMO_BIN_DIR}/tutorial/Lesson2/param
${MO_BIN_DIR}/tutorial/Lesson3/param ${OLDMO_BIN_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson4/param ${OLDMO_BIN_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson5/param ${OLDMO_BIN_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/HybridLesson/param ${OLDMO_BIN_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "benchs") ELSEIF(${n} STREQUAL "benchs")
ADD_CUSTOM_TARGET(benchs DEPENDS ADD_CUSTOM_TARGET(benchs DEPENDS
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${OLDMO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ENDIF(${n} STREQUAL "lesson1") 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") IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(install) ADD_TARGET_OLDMO(install)
ADD_TARGET_MO(benchs) ADD_TARGET_OLDMO(benchs)
ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(examples)

8
trunk/paradiseo-old-mo/tutorial/HybridLesson/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(hybrid_ga
hybrid_ga.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson6) ADD_TARGET_OLDMO(lesson6)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/HybridLesson/hybrid_ga.cpp
View file

@ -35,7 +35,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

8
trunk/paradiseo-old-mo/tutorial/Lesson1/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(hill_climbing
hill_climbing.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson1) ADD_TARGET_OLDMO(lesson1)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) ADD_EXECUTABLE(hill_climbing hill_climbing.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/Lesson1/hill_climbing.cpp
View file

@ -34,7 +34,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

8
trunk/paradiseo-old-mo/tutorial/Lesson2/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(tabu_search
tabu_search.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson2) ADD_TARGET_OLDMO(lesson2)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(tabu_search tabu_search.cpp) ADD_EXECUTABLE(tabu_search tabu_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/Lesson2/tabu_search.cpp
View file

@ -35,7 +35,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

8
trunk/paradiseo-old-mo/tutorial/Lesson3/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(simulated_annealing
simulated_annealing.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson3) ADD_TARGET_OLDMO(lesson3)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/Lesson3/simulated_annealing.cpp
View file

@ -34,7 +34,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

8
trunk/paradiseo-old-mo/tutorial/Lesson4/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(iterated_local_search
iterated_local_search.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson4) ADD_TARGET_OLDMO(lesson4)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/Lesson4/iterated_local_search.cpp
View file

@ -34,7 +34,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

8
trunk/paradiseo-old-mo/tutorial/Lesson5/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) 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 ADD_EXECUTABLE(variable_neighborhood_search
variable_neighborhood_search.cpp 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/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.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 ${TSP_BIN_DIR}/benchs/usa13509.tsp
) )
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_COMMANDS_MO() ADD_COMMANDS_OLDMO()
ADD_TARGET_MO(lesson5) ADD_TARGET_OLDMO(lesson5)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(variable_neighborhood_search variable_neighborhood_search.cpp) ADD_EXECUTABLE(variable_neighborhood_search variable_neighborhood_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)

2
trunk/paradiseo-old-mo/tutorial/Lesson5/variable_neighborhood_search.cpp
View file

@ -34,7 +34,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <tsp> #include <tsp>
#include <vector> #include <vector>

2
trunk/paradiseo-old-mo/tutorial/OldLesson/CMakeLists.txt
View file

@ -4,7 +4,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR}) INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR})
###################################################################################### ######################################################################################

2
trunk/paradiseo-old-mo/tutorial/OldLesson/minimize_function.cpp
View file

@ -34,7 +34,7 @@
*/ */
#include <eo> #include <eo>
#include <mo> #include <oldmo>
#include <function> #include <function>
void manage_configuration_file(eoParser & _parser); void manage_configuration_file(eoParser & _parser);

2
trunk/paradiseo-old-mo/tutorial/examples/CMakeLists.txt
View file

@ -1,5 +1,3 @@
###################################################################################### ######################################################################################
### 1) Where must cmake go now ? ### 1) Where must cmake go now ?
###################################################################################### ######################################################################################

2
trunk/paradiseo-old-mo/tutorial/examples/function/CMakeLists.txt
View file

@ -3,7 +3,7 @@
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
###################################################################################### ######################################################################################

2
trunk/paradiseo-old-mo/tutorial/examples/tsp/CMakeLists.txt
View file

@ -3,7 +3,7 @@
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
###################################################################################### ######################################################################################