nojhan/paradiseo
Watch
1
0
Fork
You've already forked paradiseo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CMake config updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1858 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-06-18 15:11:41 +00:00
commit 3e716f32bd
53 changed files with 1142 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/install.cmake
View file

@ -60,14 +60,14 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
IF(WIN32 AND NOT CYGWIN)
IF(CMAKE_CXX_COMPILER MATCHES cl)
IF(NOT WITH_SHARED_LIBS)
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" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
SET(CMAKE_CXX_FLAGS "/nologo /Gy")
SET(CMAKE_CXX_FLAGS_DEBUG "/W3 /MTd /Z7 /Od")
SET(CMAKE_CXX_FLAGS_RELEASE "/w /MT /O2 /wd4530")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
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" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
ENDIF(NOT WITH_SHARED_LIBS)
ENDIF(CMAKE_CXX_COMPILER MATCHES cl)
ELSE(WIN32 AND NOT CYGWIN)

18
trunk/paradiseo-mo/src/sampling/moStatistics.h
View file

@ -143,9 +143,15 @@ public:
} else {
unsigned int n = data.size();
double cov[nbS+1];
double m[nbS+1];
double sig[nbS+1];
std::vector<double> cov;
cov.resize(nbS+1);
//double cov[nbS+1];
std::vector<double> m;
m.resize(nbS+1);
//double m[nbS+1];
std::vector<double> sig;
sig.resize(nbS+1);
//double sig[nbS+1];
rho.resize(nbS+1);
phi.resize(nbS+1);
@ -188,7 +194,11 @@ public:
s--;
}
double phi2[nbS+1][nbS+1];
std::vector< std::vector<double> > phi2;
phi2.resize(nbS+1);
for(unsigned int i=0; i<phi2.size(); i++)
phi2[i].resize(nbS+1);
//double phi2[nbS+1][nbS+1];
double tmp1, tmp2;
phi2[1][1] = rho[1];

396
trunk/paradiseo-mo/tutorial/CMakeLists.txt
View file

@ -1,3 +1,393 @@
IF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_simpleHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_simpleHC.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_firstImprHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_firstImprHC.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_randomBestHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_randomBestHC.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_neutralHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_neutralHC.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_iterContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_iterContinuator.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_fitContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fitContinuator.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_evalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_evalContinuator.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_combinedContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_combinedContinuator.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/firstImprHC_maxSAT.param
${MO_BIN_DIR}/tutorial/Lesson1/firstImprHC_maxSAT.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson2/testNeighborhood.param
${MO_BIN_DIR}/tutorial/Lesson2/testNeighborhood.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson4/testSimpleTS.param
${MO_BIN_DIR}/tutorial/Lesson4/testSimpleTS.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson5/testILS.param
${MO_BIN_DIR}/tutorial/Lesson5/testILS.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testRandomWalk.param
${MO_BIN_DIR}/tutorial/Lesson6/testRandomWalk.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testMetropolisHasting.param
${MO_BIN_DIR}/tutorial/Lesson6/testMetropolisHasting.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testRandomNeutralWalk.param
${MO_BIN_DIR}/tutorial/Lesson6/testRandomNeutralWalk.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/sampling.param
${MO_BIN_DIR}/tutorial/Lesson6/sampling.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/densityOfStates.param
${MO_BIN_DIR}/tutorial/Lesson6/densityOfStates.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/autocorrelation.param
${MO_BIN_DIR}/tutorial/Lesson6/autocorrelation.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/adaptiveWalks.param
${MO_BIN_DIR}/tutorial/Lesson6/adaptiveWalks.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/fdc.param
${MO_BIN_DIR}/tutorial/Lesson6/fdc.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/neutralDegree.param
${MO_BIN_DIR}/tutorial/Lesson6/neutralDegree.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/fitnessCloud.param
${MO_BIN_DIR}/tutorial/Lesson6/fitnessCloud.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/neutralWalk.param
${MO_BIN_DIR}/tutorial/Lesson6/neutralWalk.param
)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson7/hybridAlgo.param
${MO_BIN_DIR}/tutorial/Lesson7/hybridAlgo.param
)
ENDIF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
MACRO(ADD_COMMANDS_NEWMO)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_simpleHC.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_simpleHC.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_firstImprHC.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_firstImprHC.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_randomBestHC.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_randomBestHC.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_neutralHC.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_neutralHC.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_iterContinuator.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_iterContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fitContinuator.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_fitContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_evalContinuator.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_evalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/lesson1_combinedContinuator.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/lesson1_combinedContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/firstImprHC_maxSAT.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson1/firstImprHC_maxSAT.param
${MO_BIN_DIR}/tutorial/Lesson1
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson2/testNeighborhood.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson2/testNeighborhood.param
${MO_BIN_DIR}/tutorial/Lesson2
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
${MO_BIN_DIR}/tutorial/Lesson3
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson4/testSimpleTS.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson4/testSimpleTS.param
${MO_BIN_DIR}/tutorial/Lesson4
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson5/testILS.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson5/testILS.param
${MO_BIN_DIR}/tutorial/Lesson5
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/testRandomWalk.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testRandomWalk.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/testMetropolisHasting.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testMetropolisHasting.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/testRandomNeutralWalk.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/testRandomNeutralWalk.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/sampling.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/sampling.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/densityOfStates.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/densityOfStates.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/fitnessCloud.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/fitnessCloud.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/neutralWalk.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/neutralWalk.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/autocorrelation.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/autocorrelation.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/adaptiveWalks.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/adaptiveWalks.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/fdc.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/fdc.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/neutralDegree.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson6/neutralDegree.param
${MO_BIN_DIR}/tutorial/Lesson6
)
ADD_CUSTOM_COMMAND(
OUTPUT ${MO_BIN_DIR}/tutorial/Lesson7/hybridAlgo.param
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${MO_SRC_DIR}/tutorial/Lesson7/hybridAlgo.param
${MO_BIN_DIR}/tutorial/Lesson7
)
ENDMACRO(ADD_COMMANDS_NEWMO)
MACRO(ADD_TARGET_NEWMO n)
IF(${n} STREQUAL "lesson1")
ADD_CUSTOM_TARGET(lesson1 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_simpleHC
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_simpleHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_firstImprHC
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_firstImprHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_randomBestHC
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_randomBestHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_neutralHC
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_neutralHC.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_iterContinuator
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_iterContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fitContinuator
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fitContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_fullEvalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_evalContinuator
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_evalContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_combinedContinuator
${MO_BIN_DIR}/tutorial/Lesson1/lesson1_combinedContinuator.param
${MO_BIN_DIR}/tutorial/Lesson1/firstImprHC_maxSAT
${MO_BIN_DIR}/tutorial/Lesson1/firstImprHC_maxSAT.param
)
ELSEIF(${n} STREQUAL "lesson2")
ADD_CUSTOM_TARGET(lesson2 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson2/testNeighborhood
${MO_BIN_DIR}/tutorial/Lesson2/testNeighborhood.param
)
ELSEIF(${n} STREQUAL "lesson3")
ADD_CUSTOM_TARGET(lesson3 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing
${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
)
ELSEIF(${n} STREQUAL "lesson4")
ADD_CUSTOM_TARGET(lesson4 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson4/testSimpleTS
${MO_BIN_DIR}/tutorial/Lesson4/testSimpleTS.param
)
ELSEIF(${n} STREQUAL "lesson5")
ADD_CUSTOM_TARGET(lesson5 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson5/testILS
${MO_BIN_DIR}/tutorial/Lesson5/testILS.param
)
ELSEIF(${n} STREQUAL "lesson6")
ADD_CUSTOM_TARGET(lesson6 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson6/testRandomWalk
${MO_BIN_DIR}/tutorial/Lesson6/testRandomWalk.param
${MO_BIN_DIR}/tutorial/Lesson6/testMetropolisHasting
${MO_BIN_DIR}/tutorial/Lesson6/testMetropolisHasting.param
${MO_BIN_DIR}/tutorial/Lesson6/testRandomNeutralWalk
${MO_BIN_DIR}/tutorial/Lesson6/testRandomNeutralWalk.param
${MO_BIN_DIR}/tutorial/Lesson6/sampling
${MO_BIN_DIR}/tutorial/Lesson6/sampling.param
${MO_BIN_DIR}/tutorial/Lesson6/densityOfStates
${MO_BIN_DIR}/tutorial/Lesson6/densityOfStates.param
${MO_BIN_DIR}/tutorial/Lesson6/autocorrelation
${MO_BIN_DIR}/tutorial/Lesson6/autocorrelation.param
${MO_BIN_DIR}/tutorial/Lesson6/adaptiveWalks
${MO_BIN_DIR}/tutorial/Lesson6/adaptiveWalks.param
${MO_BIN_DIR}/tutorial/Lesson6/fdc
${MO_BIN_DIR}/tutorial/Lesson6/fdc.param
${MO_BIN_DIR}/tutorial/Lesson6/neutralDegree
${MO_BIN_DIR}/tutorial/Lesson6/neutralDegree.param
${MO_BIN_DIR}/tutorial/Lesson6/fitnessCloud
${MO_BIN_DIR}/tutorial/Lesson6/fitnessCloud.param
${MO_BIN_DIR}/tutorial/Lesson6/neutralWalk
${MO_BIN_DIR}/tutorial/Lesson6/neutralWalk.param
)
ELSEIF(${n} STREQUAL "lesson7")
ADD_CUSTOM_TARGET(lesson7 DEPENDS
${MO_BIN_DIR}/tutorial/Lesson7/hybridAlgo
${MO_BIN_DIR}/tutorial/Lesson7/hybridAlgo.param
)
ENDIF(${n} STREQUAL "lesson1")
ENDMACRO(ADD_TARGET_NEWMO)
ADD_SUBDIRECTORY(Lesson1)
ADD_SUBDIRECTORY(Lesson2)
ADD_SUBDIRECTORY(Lesson3)
@ -5,4 +395,8 @@ ADD_SUBDIRECTORY(Lesson4)
ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson6)
ADD_SUBDIRECTORY(Lesson7)
ADD_SUBDIRECTORY(Lesson8)
IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
ADD_COMMANDS_NEWMO()
ADD_TARGET_NEWMO(install)
ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")

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

@ -1,20 +1,105 @@
######################################################################################
### 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(lesson1_simpleHC lesson1_simpleHC.cpp)
ADD_EXECUTABLE(lesson1_firstImprHC lesson1_firstImprHC.cpp)
ADD_EXECUTABLE(lesson1_randomBestHC lesson1_randomBestHC.cpp)
ADD_EXECUTABLE(lesson1_neutralHC lesson1_neutralHC.cpp)
ADD_EXECUTABLE(lesson1_iterContinuator lesson1_iterContinuator.cpp)
ADD_EXECUTABLE(lesson1_fitContinuator lesson1_fitContinuator.cpp)
ADD_EXECUTABLE(lesson1_fullEvalContinuator lesson1_fullEvalContinuator.cpp)
ADD_EXECUTABLE(lesson1_evalContinuator lesson1_evalContinuator.cpp)
ADD_EXECUTABLE(lesson1_combinedContinuator lesson1_combinedContinuator.cpp)
ADD_EXECUTABLE(firstImprHC_maxSAT firstImprHC_maxSAT.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 lesson1_simpleHC.cpp
lesson1_firstImprHC.cpp
lesson1_randomBestHC.cpp
lesson1_neutralHC.cpp
lesson1_iterContinuator.cpp
lesson1_fitContinuator.cpp
lesson1_fullEvalContinuator.cpp
lesson1_evalContinuator.cpp
lesson1_combinedContinuator.cpp
firstImprHC_maxSAT.cpp)
ADD_EXECUTABLE(lesson1_simpleHC
lesson1_simpleHC.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_simpleHC.param
)
ADD_EXECUTABLE(lesson1_firstImprHC
lesson1_firstImprHC.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_firstImprHC.param
)
ADD_EXECUTABLE(lesson1_randomBestHC
lesson1_randomBestHC.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_randomBestHC.param
)
ADD_EXECUTABLE(lesson1_neutralHC
lesson1_neutralHC.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_neutralHC.param
)
ADD_EXECUTABLE(lesson1_iterContinuator
lesson1_iterContinuator.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_iterContinuator.param
)
ADD_EXECUTABLE(lesson1_fitContinuator
lesson1_fitContinuator.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_fitContinuator.param
)
ADD_EXECUTABLE(lesson1_fullEvalContinuator
lesson1_fullEvalContinuator.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_fullEvalContinuator.param
)
ADD_EXECUTABLE(lesson1_evalContinuator
lesson1_evalContinuator.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_evalContinuator.param
)
ADD_EXECUTABLE(lesson1_combinedContinuator
lesson1_combinedContinuator.cpp
${MO_BIN_DIR}/tutorial/lesson1/lesson1_combinedContinuator.param
)
ADD_EXECUTABLE(firstImprHC_maxSAT
firstImprHC_maxSAT.cpp
${MO_BIN_DIR}/tutorial/lesson1/firstImprHC_maxSAT.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(lesson1)
IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(lesson1_simpleHC lesson1_simpleHC.cpp)
ADD_EXECUTABLE(lesson1_firstImprHC lesson1_firstImprHC.cpp)
ADD_EXECUTABLE(lesson1_randomBestHC lesson1_randomBestHC.cpp)
ADD_EXECUTABLE(lesson1_neutralHC lesson1_neutralHC.cpp)
ADD_EXECUTABLE(lesson1_iterContinuator lesson1_iterContinuator.cpp)
ADD_EXECUTABLE(lesson1_fitContinuator lesson1_fitContinuator.cpp)
ADD_EXECUTABLE(lesson1_fullEvalContinuator lesson1_fullEvalContinuator.cpp)
ADD_EXECUTABLE(lesson1_evalContinuator lesson1_evalContinuator.cpp)
ADD_EXECUTABLE(lesson1_combinedContinuator lesson1_combinedContinuator.cpp)
ADD_EXECUTABLE(firstImprHC_maxSAT firstImprHC_maxSAT.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(lesson1_simpleHC EXCLUDE_FROM_ALL lesson1_simpleHC.cpp)
ADD_EXECUTABLE(lesson1_firstImprHC EXCLUDE_FROM_ALL lesson1_firstImprHC.cpp)
ADD_EXECUTABLE(lesson1_randomBestHC EXCLUDE_FROM_ALL lesson1_randomBestHC.cpp)
ADD_EXECUTABLE(lesson1_neutralHC EXCLUDE_FROM_ALL lesson1_neutralHC.cpp)
ADD_EXECUTABLE(lesson1_iterContinuator EXCLUDE_FROM_ALL lesson1_iterContinuator.cpp)
ADD_EXECUTABLE(lesson1_fitContinuator EXCLUDE_FROM_ALL lesson1_fitContinuator.cpp)
ADD_EXECUTABLE(lesson1_fullEvalContinuator EXCLUDE_FROM_ALL lesson1_fullEvalContinuator.cpp)
ADD_EXECUTABLE(lesson1_evalContinuator EXCLUDE_FROM_ALL lesson1_evalContinuator.cpp)
ADD_EXECUTABLE(lesson1_combinedContinuator EXCLUDE_FROM_ALL lesson1_combinedContinuator.cpp)
ADD_EXECUTABLE(firstImprHC_maxSAT EXCLUDE_FROM_ALL firstImprHC_maxSAT.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(lesson1_simpleHC eoutils ga eo)
TARGET_LINK_LIBRARIES(lesson1_firstImprHC eoutils ga eo)

14
trunk/paradiseo-mo/tutorial/Lesson1/firstImprHC_maxSAT.param Normal file
View file

@ -0,0 +1,14 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179091 # -S : Random number seed
###### Persistence ######
# --in= # -f : Input file of the file in ncf format
# --status=./firstImprHC_maxSAT.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --nbClauses=10 # -m : Number of clauses
# --nbLitt=3 # -k : Number of litteral by clauses

15
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_combinedContinuator.param Normal file
View file

@ -0,0 +1,15 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276174177 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_combinedContinuator.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --fulleval=2 # Maximum number of full evaluation
# --eval=30 # -e : Maximum number of neighbor evaluation
# --fitness=16 # -f : Maximum fitness value to reach
# --iter=10 # -i : Maximum number of iterations

12
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_evalContinuator.param Normal file
View file

@ -0,0 +1,12 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179018 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_evalContinuator.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --eval=30 # -e : Maximum number of neighbor evaluation

11
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.param Normal file
View file

@ -0,0 +1,11 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179046 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_firstImprHC.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size

12
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_fitContinuator.param Normal file
View file

@ -0,0 +1,12 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179024 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_fitContinuator.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --fitness=16 # -f : Maximum fitness value to reach

12
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_fullEvalContinuator.param Normal file
View file

@ -0,0 +1,12 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179068 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_fullEvalContinuator.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --fulleval=2 # -e : Maximum number of full evaluation

12
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_iterContinuator.param Normal file
View file

@ -0,0 +1,12 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179030 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_iterContinuator.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --iter=10 # -i : Maximum number of iterations

12
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.param Normal file
View file

@ -0,0 +1,12 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179072 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_neutralHC.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size
# --nbStepMax=10 # -n : Number of steps of the random walk

11
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.param Normal file
View file

@ -0,0 +1,11 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179038 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_randomBestHC.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size

11
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.param Normal file
View file

@ -0,0 +1,11 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276179075 # -S : Random number seed
###### Persistence ######
# --status=./lesson1_simpleHC.status # Status file
###### Representation ######
# --vecSize=20 # -V : Genotype size

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

@ -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)

6
trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp
View file

@ -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
View 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

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

@ -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(testSimulatedAnnealing testSimulatedAnnealing.cpp)
TARGET_LINK_LIBRARIES(testSimulatedAnnealing eoutils ga eo)
######################################################################################
### 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 testSimulatedAnnealing.cpp)
ADD_EXECUTABLE(testSimulatedAnnealing
testSimulatedAnnealing.cpp
${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing.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(lesson3)
IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(testSimulatedAnnealing testSimulatedAnnealing.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(testSimulatedAnnealing EXCLUDE_FROM_ALL testSimulatedAnnealing.param)
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(testSimulatedAnnealing eoutils ga eo)

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

@ -140,7 +140,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
rndShiftNeighborhood rndShiftNH(pow(vecSize-1, 2));
rndShiftNeighborhood rndShiftNH((vecSize-1) * (vecSize-1));
/* =========================================================
*

11
trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.param Normal file
View file

@ -0,0 +1,11 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276172057 # -S : Random number seed
###### Persistence ######
# --status=./testSimulatedAnnealing.status # Status file
###### Representation ######
# --vecSize=8 # -V : Genotype size

Some files were not shown because too many files have changed in this diff Show more