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

changement a cause du deplacement des eval

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1760 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-29 10:15:25 +00:00
commit 5031737299
26 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

4
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp
View file

@ -28,7 +28,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function, and evaluation of neighbors
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <problems/eval/moOneMaxIncrEval.h>
#include <eval/moFullEvalByModif.h>
@ -123,7 +123,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
// the fitness function is just the number of 1 in the bit string
oneMaxFullEval<Indi> fullEval;
oneMaxEval<Indi> fullEval;
/* =========================================================
*

4
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp
View file

@ -28,7 +28,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function, and evaluation of neighbors
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <problems/eval/moOneMaxIncrEval.h>
#include <eval/moFullEvalByModif.h>
@ -127,7 +127,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
// the fitness function is just the number of 1 in the bit string
oneMaxFullEval<Indi> fullEval;
oneMaxEval<Indi> fullEval;
/* =========================================================
*

4
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp
View file

@ -28,7 +28,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function, and evaluation of neighbors
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <problems/eval/moOneMaxIncrEval.h>
#include <eval/moFullEvalByModif.h>
@ -123,7 +123,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
// the fitness function is just the number of 1 in the bit string
oneMaxFullEval<Indi> fullEval;
oneMaxEval<Indi> fullEval;
/* =========================================================
*

4
trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp
View file

@ -28,7 +28,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function, and evaluation of neighbors
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <problems/eval/moOneMaxIncrEval.h>
#include <eval/moFullEvalByModif.h>
@ -123,7 +123,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
// the fitness function is just the number of 1 in the bit string
oneMaxFullEval<Indi> fullEval;
oneMaxEval<Indi> fullEval;
/* =========================================================
*

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

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

@ -28,7 +28,7 @@ using namespace std;
#include <eoInit.h>
// fitness function
#include <problems/eval/queenFullEval.h>
#include <eval/queenEval.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
@ -109,7 +109,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
queenFullEval<Queen> fullEval;
queenEval<Queen> fullEval;
/* =========================================================

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

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

@ -28,7 +28,7 @@ using namespace std;
#include <eoScalarFitness.h>
// fitness function
#include <problems/eval/queenFullEval.h>
#include <eval/queenEval.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
@ -115,7 +115,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
queenFullEval<Queen> fullEval;
queenEval<Queen> fullEval;
/* =========================================================

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

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

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

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

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

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

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

@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)

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

@ -23,7 +23,7 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eoInt.h>
#include <neighborhood/moRndWithReplNeighborhood.h>

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

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