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

Decoupage du reste des leçons

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1737 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-08 15:58:08 +00:00
commit ecbc80f577
14 changed files with 64 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1 +1,7 @@
ADD_SUBDIRECTORY(Lesson1)
ADD_SUBDIRECTORY(Lesson1)
ADD_SUBDIRECTORY(Lesson2)
ADD_SUBDIRECTORY(Lesson3)
ADD_SUBDIRECTORY(Lesson4)
ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson6)
ADD_SUBDIRECTORY(Lesson7)

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

@ -13,6 +13,3 @@ TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo)
TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo)
TARGET_LINK_LIBRARIES(testRandomBestHC eoutils ga eo)
TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo)

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

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

@ -0,0 +1,9 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testSimulatedAnnealing testSimulatedAnnealing.cpp)
TARGET_LINK_LIBRARIES(testSimulatedAnnealing eoutils ga eo)

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

@ -23,10 +23,10 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <problems/eval/oneMaxFullEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moRndWithReplNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
@ -99,7 +99,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
FuncOneMax<Indi> eval(vecSize);
oneMaxFullEval<Indi> eval;
/* =========================================================

9
trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt Normal file
View file

@ -0,0 +1,9 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testSimpleTS testSimpleTS.cpp)
TARGET_LINK_LIBRARIES(testSimpleTS eoutils ga eo)

6
trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp
View file

@ -23,10 +23,10 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <problems/eval/oneMaxFullEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moOrderNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <mo>
@ -100,7 +100,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
FuncOneMax<Indi> fulleval(vecSize);
oneMaxFullEval<Indi> fulleval;
/* =========================================================

9
trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt Normal file
View file

@ -0,0 +1,9 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testILS testILS.cpp)
TARGET_LINK_LIBRARIES(testILS eoutils ga eo)

7
trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp
View file

@ -24,12 +24,11 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <funcNK.h>
#include <problems/eval/oneMaxFullEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moOrderNeighborhood.h>
#include <neighborhood/moRndWithoutReplNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <neighborhood/moDummyNeighbor.h>
@ -113,7 +112,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
FuncOneMax<Indi> eval(vecSize);
oneMaxFullEval<Indi> eval;
//FuncNK<Indi> eval(vecSize, 2);

14
trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt Normal file
View file

@ -0,0 +1,14 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testRandomWalk testRandomWalk.cpp)
ADD_EXECUTABLE(testMetropolisHasting testMetropolisHasting.cpp)
ADD_EXECUTABLE(testRandomNeutralWalk testRandomNeutralWalk.cpp)
TARGET_LINK_LIBRARIES(testRandomWalk eoutils ga eo)
TARGET_LINK_LIBRARIES(testMetropolisHasting eoutils ga eo)
TARGET_LINK_LIBRARIES(testRandomNeutralWalk eoutils ga eo)

6
trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp
View file

@ -23,10 +23,10 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <problems/eval/oneMaxFullEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moRndWithReplNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
@ -102,7 +102,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
FuncOneMax<Indi> eval(vecSize);
oneMaxFullEval<Indi> eval;
/* =========================================================

2
trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.cpp
View file

@ -23,7 +23,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcRoyalRoad.h>
#include "../oneMax/src/funcRoyalRoad.h"
#include <eoInt.h>
#include <neighborhood/moRndWithoutReplNeighborhood.h>
#include <problems/bitString/moBitNeighbor.h>

6
trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp
View file

@ -23,10 +23,10 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <problems/eval/oneMaxFullEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moRndWithReplNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
@ -108,7 +108,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
FuncOneMax<Indi> eval(vecSize);
oneMaxFullEval<Indi> eval;
/* =========================================================

0
trunk/paradiseo-mo/tutorial/Lesson7/CMakeLists.txt Normal file
View file