CMake config updated
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1858 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
d3c53d92cc
commit
3e716f32bd
53 changed files with 1142 additions and 80 deletions
|
|
@ -1,10 +1,41 @@
|
|||
######################################################################################
|
||||
### 1) Include the sources
|
||||
######################################################################################
|
||||
|
||||
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
|
||||
${MO_SRC_DIR}/src
|
||||
${PROBLEMS_SRC_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../src)
|
||||
|
||||
######################################################################################
|
||||
### 2) Specify where CMake can find the libraries
|
||||
######################################################################################
|
||||
|
||||
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
|
||||
|
||||
ADD_EXECUTABLE(testNeighborhood testNeighborhood.cpp)
|
||||
|
||||
######################################################################################
|
||||
### 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" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
|
||||
SOURCE_GROUP(src FILES testNeighborhood.cpp)
|
||||
ADD_EXECUTABLE(testNeighborhood
|
||||
testNeighborhood.cpp
|
||||
${MO_BIN_DIR}/tutorial/Lesson2/testNeighborhood.param
|
||||
)
|
||||
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
|
||||
ADD_COMMANDS_NEWMO()
|
||||
ADD_TARGET_NEWMO(lesson2)
|
||||
IF(ENABLE_CMAKE_EXAMPLE)
|
||||
ADD_EXECUTABLE(testNeighborhood testNeighborhood.cpp)
|
||||
ELSE(ENABLE_CMAKE_EXAMPLE)
|
||||
ADD_EXECUTABLE(testNeighborhood EXCLUDE_FROM_ALL testNeighborhood.cpp)
|
||||
ENDIF(ENABLE_CMAKE_EXAMPLE)
|
||||
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
|
||||
|
||||
######################################################################################
|
||||
### 4) Link the librairies for your target(s)
|
||||
######################################################################################
|
||||
|
||||
TARGET_LINK_LIBRARIES(testNeighborhood eoutils ga eo)
|
||||
|
|
|
|||
|
|
@ -138,9 +138,9 @@ void main_function(int argc, char **argv)
|
|||
* ========================================================= */
|
||||
|
||||
swapNeighborhood swapNH;
|
||||
orderShiftNeighborhood orderShiftNH(pow(vecSize-1, 2));
|
||||
rndWithoutReplShiftNeighborhood rndNoReplShiftNH(pow(vecSize-1, 2));
|
||||
rndWithReplShiftNeighborhood rndReplShiftNH(pow(vecSize-1, 2));
|
||||
orderShiftNeighborhood orderShiftNH((vecSize-1) * (vecSize-1));
|
||||
rndWithoutReplShiftNeighborhood rndNoReplShiftNH((vecSize-1) * (vecSize-1));
|
||||
rndWithReplShiftNeighborhood rndReplShiftNH((vecSize-1) * (vecSize-1));
|
||||
|
||||
|
||||
/* =========================================================
|
||||
|
|
|
|||
11
trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.param
Normal file
11
trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.param
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
###### General ######
|
||||
# --help=0 # -h : Prints this message
|
||||
# --stopOnUnknownParam=1 # Stop if unkown param entered
|
||||
# --seed=1276172025 # -S : Random number seed
|
||||
|
||||
###### Persistence ######
|
||||
# --status=./testNeighborhood.status # Status file
|
||||
|
||||
###### Representation ######
|
||||
# --vecSize=8 # -V : Genotype size
|
||||
Loading…
Add table
Add a link
Reference in a new issue