From 50317372997928033959b7561f206c5a0df34b4f Mon Sep 17 00:00:00 2001 From: jhumeau Date: Thu, 29 Apr 2010 10:15:25 +0000 Subject: [PATCH] changement a cause du deplacement des eval git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1760 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/test/CMakeLists.txt | 1 + trunk/paradiseo-mo/test/t-moFirstImprHC.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moILSexplorer.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moLocalSearch.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moRandomBestHC.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moRestartPerturb.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moSA.cpp | 4 ++-- trunk/paradiseo-mo/test/t-moSimpleHC.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt | 1 + trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt | 1 + trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt | 1 + .../paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt | 1 + trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt | 1 + trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp | 4 ++-- trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt | 1 + trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp | 2 +- trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp | 4 ++-- 26 files changed, 44 insertions(+), 37 deletions(-) diff --git a/trunk/paradiseo-mo/test/CMakeLists.txt b/trunk/paradiseo-mo/test/CMakeLists.txt index 536f35ab2..5a617e2b4 100644 --- a/trunk/paradiseo-mo/test/CMakeLists.txt +++ b/trunk/paradiseo-mo/test/CMakeLists.txt @@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${PROBLEMS_SRC_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### diff --git a/trunk/paradiseo-mo/test/t-moFirstImprHC.cpp b/trunk/paradiseo-mo/test/t-moFirstImprHC.cpp index 698c1f33b..2a60128ae 100644 --- a/trunk/paradiseo-mo/test/t-moFirstImprHC.cpp +++ b/trunk/paradiseo-mo/test/t-moFirstImprHC.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include #include #include @@ -42,7 +42,7 @@ int main(){ std::cout << "[t-moFirstImprHC] => START" << std::endl; bitNeighborhood nh(4); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(4); //test first constructor diff --git a/trunk/paradiseo-mo/test/t-moILSexplorer.cpp b/trunk/paradiseo-mo/test/t-moILSexplorer.cpp index 705a7c0d8..2c75320a1 100644 --- a/trunk/paradiseo-mo/test/t-moILSexplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moILSexplorer.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include #include #include #include @@ -55,7 +55,7 @@ int main(){ std::cout << "[t-moILSexplorer] => START" << std::endl; bitNeighborhood nh(4); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(4); bitVector sol(4, true); diff --git a/trunk/paradiseo-mo/test/t-moLocalSearch.cpp b/trunk/paradiseo-mo/test/t-moLocalSearch.cpp index 5b6d6c31f..7b7ade4ab 100644 --- a/trunk/paradiseo-mo/test/t-moLocalSearch.cpp +++ b/trunk/paradiseo-mo/test/t-moLocalSearch.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ int main(){ bitNeighborhood nh(8); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(8); moTrueContinuator cont; moSolNeighborComparator sncomp; diff --git a/trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp b/trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp index 39a895a28..5e5b627d3 100644 --- a/trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp +++ b/trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp @@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include class dummyMonOp: public eoMonOp{ @@ -51,7 +51,7 @@ int main(){ std::cout << "[t-moMonOpPerturb] => START" << std::endl; dummyMonOp op; - oneMaxFullEval eval; + oneMaxEval eval; bitVector sol; sol.push_back(1); diff --git a/trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp b/trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp index bee0fa439..fb85a1edb 100644 --- a/trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp +++ b/trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp @@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include "moTestClass.h" #include -#include +#include #include typedef moOrderNeighborhood Neighborhood; @@ -43,7 +43,7 @@ int main(){ std::cout << "[t-moNeighborhoodPerturb] => START" << std::endl; - oneMaxFullEval eval; + oneMaxEval eval; moFullEvalByCopy moeval(eval); diff --git a/trunk/paradiseo-mo/test/t-moRandomBestHC.cpp b/trunk/paradiseo-mo/test/t-moRandomBestHC.cpp index eb958658c..4e821f345 100644 --- a/trunk/paradiseo-mo/test/t-moRandomBestHC.cpp +++ b/trunk/paradiseo-mo/test/t-moRandomBestHC.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include #include #include @@ -42,7 +42,7 @@ int main(){ std::cout << "[t-moRandomBestHC] => START" << std::endl; bitNeighborhood nh(4); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(4); //test first constructor diff --git a/trunk/paradiseo-mo/test/t-moRestartPerturb.cpp b/trunk/paradiseo-mo/test/t-moRestartPerturb.cpp index aa1d14d01..a3a77c4b5 100644 --- a/trunk/paradiseo-mo/test/t-moRestartPerturb.cpp +++ b/trunk/paradiseo-mo/test/t-moRestartPerturb.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ int main(){ dummyInit initializer(4); - queenFullEval eval; + queenEval eval; moRestartPerturb > test(initializer, eval, 3); diff --git a/trunk/paradiseo-mo/test/t-moSA.cpp b/trunk/paradiseo-mo/test/t-moSA.cpp index 5682bc697..f4ddbe2e9 100644 --- a/trunk/paradiseo-mo/test/t-moSA.cpp +++ b/trunk/paradiseo-mo/test/t-moSA.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include #include #include #include @@ -43,7 +43,7 @@ int main(){ std::cout << "[t-moSA] => START" << std::endl; bitNeighborhood nh(4); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(4); //test first constructor diff --git a/trunk/paradiseo-mo/test/t-moSimpleHC.cpp b/trunk/paradiseo-mo/test/t-moSimpleHC.cpp index fc67ba398..aab4a2013 100644 --- a/trunk/paradiseo-mo/test/t-moSimpleHC.cpp +++ b/trunk/paradiseo-mo/test/t-moSimpleHC.cpp @@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include "moTestClass.h" -#include +#include #include #include @@ -43,7 +43,7 @@ int main(){ std::cout << "[t-moSimpleHC] => START" << std::endl; bitNeighborhood nh(4); - oneMaxFullEval fullEval; + oneMaxEval fullEval; evalOneMax eval(4); //test first constructor diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index b86c30e17..fb04d5ef2 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp index d8db8d519..d39b96b70 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp @@ -28,7 +28,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function, and evaluation of neighbors -#include +#include #include #include @@ -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 fullEval; + oneMaxEval fullEval; /* ========================================================= * diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp index 3d1451a8c..d16d4d168 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp @@ -28,7 +28,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function, and evaluation of neighbors -#include +#include #include #include @@ -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 fullEval; + oneMaxEval fullEval; /* ========================================================= * diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp index 5ab554378..afdccb0af 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp @@ -28,7 +28,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function, and evaluation of neighbors -#include +#include #include #include @@ -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 fullEval; + oneMaxEval fullEval; /* ========================================================= * diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp index 7fd88507d..9e5bff196 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp @@ -28,7 +28,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function, and evaluation of neighbors -#include +#include #include #include @@ -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 fullEval; + oneMaxEval fullEval; /* ========================================================= * diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt index 593460073..27955f049 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp index 21aef332e..8b771d769 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp @@ -28,7 +28,7 @@ using namespace std; #include // fitness function -#include +#include #include #include @@ -109,7 +109,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - queenFullEval fullEval; + queenEval fullEval; /* ========================================================= diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index 2e04ecf11..b4a16cc46 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp index c69b2baf7..0a81343b1 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp @@ -28,7 +28,7 @@ using namespace std; #include // fitness function -#include +#include #include #include @@ -115,7 +115,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - queenFullEval fullEval; + queenEval fullEval; /* ========================================================= diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt index dfc071a50..077925797 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp b/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp index 9a7d61be2..4d6f80bfe 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp @@ -23,7 +23,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function -#include +#include #include #include #include @@ -100,7 +100,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - oneMaxFullEval fulleval; + oneMaxEval fulleval; /* ========================================================= diff --git a/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt index 2b619810e..eafb1faae 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp b/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp index 9745a6d65..c3f8bafa7 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp @@ -24,7 +24,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function -#include +#include #include #include #include @@ -112,7 +112,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - oneMaxFullEval eval; + oneMaxEval eval; //FuncNK eval(vecSize, 2); diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt index eb3f3b2ad..109ff7f40 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -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) diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp index cf3c85b5a..7c9612584 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp @@ -23,7 +23,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function -#include +#include #include #include #include diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp index 7b020d229..5eab2c1d1 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp @@ -23,7 +23,7 @@ using namespace std; //----------------------------------------------------------------------------- // fitness function -#include +#include #include #include #include @@ -108,7 +108,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - oneMaxFullEval eval; + oneMaxEval eval; /* =========================================================