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

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1329 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-01-14 12:32:48 +00:00
commit 8c6554b415
20 changed files with 137 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

43
branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt
View file

@ -50,8 +50,8 @@ IF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CM
${MO_SRC_DIR}/tutorial/Lesson5/param ${MO_SRC_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/Lesson5/param ${MO_BIN_DIR}/tutorial/Lesson5/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/param ${MO_SRC_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/Lesson6/param ${MO_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")
@ -116,8 +116,8 @@ MACRO(ADD_COMMANDS_MO)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/param ${MO_SRC_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/Lesson6 ${MO_BIN_DIR}/tutorial/HybridLesson
) )
ENDMACRO(ADD_COMMANDS_MO) ENDMACRO(ADD_COMMANDS_MO)
@ -125,12 +125,17 @@ MACRO(ADD_TARGET_MO 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 ${MO_BIN_DIR}/tutorial/Lesson1/param
${MO_BIN_DIR}/tutorial/Lesson1/minimize_function ${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
) )
ELSEIF(${n} STREQUAL "lesson2") ELSEIF(${n} STREQUAL "lesson2")
ADD_CUSTOM_TARGET(lesson2 DEPENDS ADD_CUSTOM_TARGET(lesson2 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson2/param ${MO_BIN_DIR}/tutorial/Lesson2/param
${MO_BIN_DIR}/tutorial/Lesson2/hill_climbing ${MO_BIN_DIR}/tutorial/Lesson2/tabu_search
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${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/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@ -140,7 +145,7 @@ MACRO(ADD_TARGET_MO n)
ELSEIF(${n} STREQUAL "lesson3") ELSEIF(${n} STREQUAL "lesson3")
ADD_CUSTOM_TARGET(lesson3 DEPENDS ADD_CUSTOM_TARGET(lesson3 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson3/param ${MO_BIN_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson3/tabu_search ${MO_BIN_DIR}/tutorial/Lesson3/simulated_annealing
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${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/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@ -150,27 +155,17 @@ MACRO(ADD_TARGET_MO n)
ELSEIF(${n} STREQUAL "lesson4") ELSEIF(${n} STREQUAL "lesson4")
ADD_CUSTOM_TARGET(lesson4 DEPENDS ADD_CUSTOM_TARGET(lesson4 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson4/param ${MO_BIN_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson4/simulated_annealing ${MO_BIN_DIR}/tutorial/Lesson4/iterated_local_search
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${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/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.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/rl5915.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
) )
ELSEIF(${n} STREQUAL "lesson5") ELSEIF(${n} STREQUAL "hybridlesson")
ADD_CUSTOM_TARGET(lesson5 DEPENDS ADD_CUSTOM_TARGET(hybridlesson DEPENDS
${MO_BIN_DIR}/tutorial/Lesson5/param ${MO_BIN_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/Lesson5/iterated_local_search ${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
)
ELSEIF(${n} STREQUAL "lesson6")
ADD_CUSTOM_TARGET(lesson6 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson6/param
${MO_BIN_DIR}/tutorial/Lesson6/hybrid_ga
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${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/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@ -184,7 +179,7 @@ MACRO(ADD_TARGET_MO n)
${MO_BIN_DIR}/tutorial/Lesson3/param ${MO_BIN_DIR}/tutorial/Lesson3/param
${MO_BIN_DIR}/tutorial/Lesson4/param ${MO_BIN_DIR}/tutorial/Lesson4/param
${MO_BIN_DIR}/tutorial/Lesson5/param ${MO_BIN_DIR}/tutorial/Lesson5/param
${MO_BIN_DIR}/tutorial/Lesson6/param ${MO_BIN_DIR}/tutorial/HybridLesson/param
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${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/eil101.tsp
${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@ -214,4 +209,4 @@ ADD_SUBDIRECTORY(Lesson2)
ADD_SUBDIRECTORY(Lesson3) ADD_SUBDIRECTORY(Lesson3)
ADD_SUBDIRECTORY(Lesson4) ADD_SUBDIRECTORY(Lesson4)
ADD_SUBDIRECTORY(Lesson5) ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson6) ADD_SUBDIRECTORY(HybridLesson)

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt → branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/CMakeLists.txt
View file

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/hybrid_ga.cpp → branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/hybrid_ga.cpp
View file

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/param → branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/param
View file

42
branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
View file

@ -5,54 +5,65 @@
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(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR}) INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 2) Specify where CMake can find the libraries ### 2) Specify where CMake can find the libraries
###################################################################################### ######################################################################################
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib) LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
SOURCE_GROUP(src FILES minimize_function.cpp) SOURCE_GROUP(src FILES hill_climbing.cpp)
ADD_EXECUTABLE(minimize_function
minimize_function.cpp SOURCE_GROUP(benchs FILES
${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp
${TSP_BIN_DIR}/benchs/usa13509.tsp
)
ADD_EXECUTABLE(hill_climbing
hill_climbing.cpp
${MO_BIN_DIR}/tutorial/Lesson1/param ${MO_BIN_DIR}/tutorial/Lesson1/param
${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.tsp
${TSP_BIN_DIR}/benchs/rl5915.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_MO()
ADD_TARGET_MO(lesson1) ADD_TARGET_MO(lesson1)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(minimize_function minimize_function.cpp) ADD_EXECUTABLE(hill_climbing hill_climbing.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL minimize_function.cpp) ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL hill_climbing.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE) ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(minimize_function function)
ADD_DEPENDENCIES(hill_climbing tsp)
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 4) Optionnal: define your target(s)'s version: no effect for windows ### 4) Optionnal: define your target(s)'s version: no effect for windows
###################################################################################### ######################################################################################
SET(HILLCLIMBING_VERSION ${GLOBAL_VERSION})
SET(MINIMIZEFUNCTION_VERSION ${GLOBAL_VERSION}) SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}")
SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_VERSION}")
###################################################################################### ######################################################################################
@ -61,6 +72,7 @@ SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_V
### 5) Link the librairies for your target(s) ### 5) Link the librairies for your target(s)
###################################################################################### ######################################################################################
TARGET_LINK_LIBRARIES(minimize_function function eo eoutils) TARGET_LINK_LIBRARIES(hill_climbing tsp eo eoutils)
###################################################################################### ######################################################################################

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/hill_climbing.cpp → branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
View file

7
branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/param
View file

@ -4,7 +4,6 @@
# --stopOnUnknownParam=1 # Stop if unkown param entered # --stopOnUnknownParam=1 # Stop if unkown param entered
###### Configuration ###### ###### Configuration ######
# --initialBound=1 # Bound for the initial affectation. # --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
# --searchBound=1 # Bound for neighbourhood exploration. # --seed=1203517190 # Seed for rand.
# --searchStep=1 # Step between two values during the neighbourhood exploration. # --selectionType=Best # Type of the selection: 'Best', 'First' or 'Random'.
# --selectionType=First # Type of the selection: 'Best', 'First' or 'Random'.

23
branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
View file

@ -1,3 +1,5 @@
###################################################################################### ######################################################################################
### 1) Include the sources ### 1) Include the sources
###################################################################################### ######################################################################################
@ -22,8 +24,10 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
SOURCE_GROUP(src FILES hill_climbing.cpp) SOURCE_GROUP(src FILES tabu_search.cpp)
SOURCE_GROUP(benchs FILES SOURCE_GROUP(benchs FILES
${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
@ -33,8 +37,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
) )
ADD_EXECUTABLE(hill_climbing ADD_EXECUTABLE(tabu_search
hill_climbing.cpp tabu_search.cpp
${MO_BIN_DIR}/tutorial/Lesson2/param ${MO_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
@ -46,14 +50,13 @@ ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL
ADD_COMMANDS_MO() ADD_COMMANDS_MO()
ADD_TARGET_MO(lesson2) ADD_TARGET_MO(lesson2)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) ADD_EXECUTABLE(tabu_search tabu_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL hill_climbing.cpp) ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL tabu_search.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE) ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(tabu_search tsp)
ADD_DEPENDENCIES(hill_climbing tsp)
###################################################################################### ######################################################################################
@ -62,8 +65,8 @@ ADD_DEPENDENCIES(hill_climbing tsp)
### 4) Optionnal: define your target(s)'s version: no effect for windows ### 4) Optionnal: define your target(s)'s version: no effect for windows
###################################################################################### ######################################################################################
SET(HILLCLIMBING_VERSION ${GLOBAL_VERSION}) SET(TABUSEARCH_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}") SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}")
###################################################################################### ######################################################################################
@ -72,7 +75,7 @@ SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}"
### 5) Link the librairies for your target(s) ### 5) Link the librairies for your target(s)
###################################################################################### ######################################################################################
TARGET_LINK_LIBRARIES(hill_climbing tsp eo eoutils) TARGET_LINK_LIBRARIES(tabu_search tsp eo eoutils)
###################################################################################### ######################################################################################

8
branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/param
View file

@ -4,6 +4,8 @@
# --stopOnUnknownParam=1 # Stop if unkown param entered # --stopOnUnknownParam=1 # Stop if unkown param entered
###### Configuration ###### ###### Configuration ######
# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance. # --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance
# --seed=1203517190 # Seed for rand. # --seed=1202917905 # Seed for rand
# --selectionType=Best # Type of the selection: 'Best', 'First' or 'Random'. # --tabuListSize=10 # Size of the tabu list
# --maxIter=1000 # Maximum number of iterations
# --tabuListType=TwoOpt # Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/tabu_search.cpp → branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
View file

21
branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
View file

@ -1,5 +1,4 @@
###################################################################################### ######################################################################################
### 1) Include the sources ### 1) Include the sources
###################################################################################### ######################################################################################
@ -24,10 +23,8 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
SOURCE_GROUP(src FILES tabu_search.cpp) SOURCE_GROUP(src FILES simulated_annealing.cpp)
SOURCE_GROUP(benchs FILES SOURCE_GROUP(benchs FILES
${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
@ -37,8 +34,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
) )
ADD_EXECUTABLE(tabu_search ADD_EXECUTABLE(simulated_annealing
tabu_search.cpp simulated_annealing.cpp
${MO_BIN_DIR}/tutorial/Lesson3/param ${MO_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
@ -50,13 +47,13 @@ ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL
ADD_COMMANDS_MO() ADD_COMMANDS_MO()
ADD_TARGET_MO(lesson3) ADD_TARGET_MO(lesson3)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(tabu_search tabu_search.cpp) ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL tabu_search.cpp) ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL simulated_annealing.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE) ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(tabu_search tsp) ADD_DEPENDENCIES(simulated_annealing tsp)
###################################################################################### ######################################################################################
@ -65,8 +62,8 @@ ADD_DEPENDENCIES(tabu_search tsp)
### 4) Optionnal: define your target(s)'s version: no effect for windows ### 4) Optionnal: define your target(s)'s version: no effect for windows
###################################################################################### ######################################################################################
SET(TABUSEARCH_VERSION ${GLOBAL_VERSION}) SET(SIMULATEDANNEALING_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}") SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}")
###################################################################################### ######################################################################################
@ -75,7 +72,7 @@ SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}")
### 5) Link the librairies for your target(s) ### 5) Link the librairies for your target(s)
###################################################################################### ######################################################################################
TARGET_LINK_LIBRARIES(tabu_search tsp eo eoutils) TARGET_LINK_LIBRARIES(simulated_annealing tsp eo eoutils)
###################################################################################### ######################################################################################

13
branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/param
View file

@ -4,8 +4,11 @@
# --stopOnUnknownParam=1 # Stop if unkown param entered # --stopOnUnknownParam=1 # Stop if unkown param entered
###### Configuration ###### ###### Configuration ######
# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance # --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
# --seed=1202917905 # Seed for rand # --seed=1202919978 # Seed for rand.
# --tabuListSize=10 # Size of the tabu list # --maxIter=1000 # Maximum number of iterations.
# --maxIter=1000 # Maximum number of iterations # --initialTemp=1000 # Initial temperature.
# --tabuListType=TwoOpt # Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution' # --threshold=0.1 # Minimum temperature allowed.
# --expoRatio=0.98 # Ratio used if exponential cooling schedule is chosen.
# --lineaRatio=0.5 # Ratio used if linear cooling schedule is chosen.
# --coolSchedType=Expo # Type the cooling schedule: 'Expo' or 'Linear'.

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp → branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
View file

21
branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
View file

@ -1,4 +1,5 @@
###################################################################################### ######################################################################################
### 1) Include the sources ### 1) Include the sources
###################################################################################### ######################################################################################
@ -24,7 +25,7 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
###################################################################################### ######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
SOURCE_GROUP(src FILES simulated_annealing.cpp) SOURCE_GROUP(src FILES iterated_local_search.cpp)
SOURCE_GROUP(benchs FILES SOURCE_GROUP(benchs FILES
${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
@ -34,8 +35,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
) )
ADD_EXECUTABLE(simulated_annealing ADD_EXECUTABLE(iterated_local_search
simulated_annealing.cpp iterated_local_search.cpp
${MO_BIN_DIR}/tutorial/Lesson4/param ${MO_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
@ -47,13 +48,14 @@ ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL
ADD_COMMANDS_MO() ADD_COMMANDS_MO()
ADD_TARGET_MO(lesson4) ADD_TARGET_MO(lesson4)
IF(ENABLE_CMAKE_EXAMPLE) IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE) ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL simulated_annealing.cpp) ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL iterated_local_search.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE) ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(simulated_annealing tsp) ADD_DEPENDENCIES(iterated_local_search tsp)
###################################################################################### ######################################################################################
@ -62,8 +64,8 @@ ADD_DEPENDENCIES(simulated_annealing tsp)
### 4) Optionnal: define your target(s)'s version: no effect for windows ### 4) Optionnal: define your target(s)'s version: no effect for windows
###################################################################################### ######################################################################################
SET(SIMULATEDANNEALING_VERSION ${GLOBAL_VERSION}) SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}") SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}")
###################################################################################### ######################################################################################
@ -72,7 +74,6 @@ SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALI
### 5) Link the librairies for your target(s) ### 5) Link the librairies for your target(s)
###################################################################################### ######################################################################################
TARGET_LINK_LIBRARIES(simulated_annealing tsp eo eoutils) TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils)
###################################################################################### ######################################################################################

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/iterated_local_search.cpp → branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
View file

7
branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/param
View file

@ -5,10 +5,5 @@
###### Configuration ###### ###### Configuration ######
# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance. # --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
# --seed=1202919978 # Seed for rand. # --seed=1203080388 # Seed for rand.
# --maxIter=1000 # Maximum number of iterations. # --maxIter=1000 # Maximum number of iterations.
# --initialTemp=1000 # Initial temperature.
# --threshold=0.1 # Minimum temperature allowed.
# --expoRatio=0.98 # Ratio used if exponential cooling schedule is chosen.
# --lineaRatio=0.5 # Ratio used if linear cooling schedule is chosen.
# --coolSchedType=Expo # Type the cooling schedule: 'Expo' or 'Linear'.

9
branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param
View file

@ -1,9 +0,0 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
###### Configuration ######
# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
# --seed=1203080388 # Seed for rand.
# --maxIter=1000 # Maximum number of iterations.

50
branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt → branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/CMakeLists.txt
View file

@ -1,5 +1,3 @@
###################################################################################### ######################################################################################
### 1) Include the sources ### 1) Include the sources
###################################################################################### ######################################################################################
@ -7,65 +5,39 @@
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(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR})
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 2) Specify where CMake can find the libraries ### 2) Specify where CMake can find the libraries
###################################################################################### ######################################################################################
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib)
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ADD_EXECUTABLE(minimize_function
SOURCE_GROUP(src FILES iterated_local_search.cpp) ADD_DEPENDENCIES(minimize_function function)
SOURCE_GROUP(benchs FILES
${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp
${TSP_BIN_DIR}/benchs/usa13509.tsp
)
ADD_EXECUTABLE(iterated_local_search
iterated_local_search.cpp
${MO_BIN_DIR}/tutorial/Lesson5/param
${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/pr2392.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp
${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)
IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL iterated_local_search.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(iterated_local_search tsp)
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
### 4) Optionnal: define your target(s)'s version: no effect for windows ### 4) Optionnal: define your target(s)'s version: no effect for windows
###################################################################################### ######################################################################################
SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}") SET(MINIMIZEFUNCTION_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_VERSION}")
###################################################################################### ######################################################################################
@ -74,6 +46,6 @@ SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALS
### 5) Link the librairies for your target(s) ### 5) Link the librairies for your target(s)
###################################################################################### ######################################################################################
TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils) TARGET_LINK_LIBRARIES(minimize_function function eo eoutils)
###################################################################################### ######################################################################################

0
branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/minimize_function.cpp → branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/minimize_function.cpp
View file

10
branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/param Normal file
View file

@ -0,0 +1,10 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
###### Configuration ######
# --initialBound=1 # Bound for the initial affectation.
# --searchBound=1 # Bound for neighbourhood exploration.
# --searchStep=1 # Step between two values during the neighbourhood exploration.
# --selectionType=First # Type of the selection: 'Best', 'First' or 'Random'.