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

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

trunk/paradiseo-mo/test/t-moFirstImprHC.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <algo/moFirstImprHC.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <continuator/moTrueContinuator.h>
 #include <comparator/moSolNeighborComparator.h>
 
@@ -42,7 +42,7 @@ int main(){
 	std::cout << "[t-moFirstImprHC] => START" << std::endl;
 
 	bitNeighborhood nh(4);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(4);
 
 	//test first constructor

trunk/paradiseo-mo/test/t-moILSexplorer.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <algo/moSimpleHC.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <coolingSchedule/moSimpleCoolingSchedule.h>
 #include <continuator/moTrueContinuator.h>
 #include <comparator/moSolNeighborComparator.h>
@@ -55,7 +55,7 @@ int main(){
 
 	std::cout << "[t-moILSexplorer] => START" << std::endl;
 	bitNeighborhood nh(4);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(4);
 
 	bitVector sol(4, true);

trunk/paradiseo-mo/test/t-moLocalSearch.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <algo/moLocalSearch.h>
 #include <explorer/moSimpleHCexplorer.h>
 #include <continuator/moTrueContinuator.h>
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <comparator/moSolNeighborComparator.h>
 #include <comparator/moNeighborComparator.h>
 
@@ -46,7 +46,7 @@ int main(){
 
 
 	bitNeighborhood nh(8);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(8);
 	moTrueContinuator<bitNeighbor> cont;
 	moSolNeighborComparator<bitNeighbor> sncomp;

trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp

@@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <perturb/moMonOpPerturb.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 
 
 class dummyMonOp: public eoMonOp<bitVector>{
@@ -51,7 +51,7 @@ int main(){
 	std::cout << "[t-moMonOpPerturb] => START" << std::endl;
 
 	dummyMonOp op;
-	oneMaxFullEval<bitVector> eval;
+	oneMaxEval<bitVector> eval;
 
 	bitVector sol;
 	sol.push_back(1);

trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp

@@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include "moTestClass.h"
 
 #include <perturb/moNeighborhoodPerturb.h>
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <eval/moFullEvalByCopy.h>
 
 typedef moOrderNeighborhood<bitNeighbor> Neighborhood;
@@ -43,7 +43,7 @@ int main(){
 
 	std::cout << "[t-moNeighborhoodPerturb] => START" << std::endl;
 
-	oneMaxFullEval<bitVector> eval;
+	oneMaxEval<bitVector> eval;
 
 	moFullEvalByCopy<bitNeighbor> moeval(eval);
 

trunk/paradiseo-mo/test/t-moRandomBestHC.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <algo/moRandomBestHC.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <continuator/moTrueContinuator.h>
 #include <comparator/moSolNeighborComparator.h>
 
@@ -42,7 +42,7 @@ int main(){
 	std::cout << "[t-moRandomBestHC] => START" << std::endl;
 
 	bitNeighborhood nh(4);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(4);
 
 	//test first constructor

trunk/paradiseo-mo/test/t-moRestartPerturb.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <perturb/moRestartPerturb.h>
 #include <problems/permutation/moShiftNeighbor.h>
-#include <problems/eval/queenFullEval.h>
+#include <eval/queenEval.h>
 
 #include <eoInt.h>
 #include <eoInit.h>
@@ -67,7 +67,7 @@ int main(){
 
 	dummyInit initializer(4);
 
-	queenFullEval<QUEEN> eval;
+	queenEval<QUEEN> eval;
 
 	moRestartPerturb<moShiftNeighbor<QUEEN> > test(initializer, eval, 3);
 

trunk/paradiseo-mo/test/t-moSA.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <algo/moSA.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <coolingSchedule/moSimpleCoolingSchedule.h>
 #include <continuator/moTrueContinuator.h>
 #include <comparator/moSolNeighborComparator.h>
@@ -43,7 +43,7 @@ int main(){
 	std::cout << "[t-moSA] => START" << std::endl;
 
 	bitNeighborhood nh(4);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(4);
 
 	//test first constructor

trunk/paradiseo-mo/test/t-moSimpleHC.cpp

@@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <algo/moSimpleHC.h>
 #include "moTestClass.h"
-#include <problems/eval/oneMaxFullEval.h>
+#include <eval/oneMaxEval.h>
 #include <continuator/moTrueContinuator.h>
 #include <comparator/moSolNeighborComparator.h>
 
@@ -43,7 +43,7 @@ int main(){
 	std::cout << "[t-moSimpleHC] => START" << std::endl;
 
 	bitNeighborhood nh(4);
-	oneMaxFullEval<bitVector> fullEval;
+	oneMaxEval<bitVector> fullEval;
 	evalOneMax eval(4);
 
 	//test first constructor

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)	

trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.cpp

@@ -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;
 
   /* =========================================================
    *

trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.cpp

@@ -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;
 
   /* =========================================================
    *

trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.cpp

@@ -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;
 
   /* =========================================================
    *

trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.cpp

@@ -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;
 
   /* =========================================================
    *

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)	

trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp

@@ -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;
 
 
     /* =========================================================

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)	

trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp

@@ -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;
 
 
     /* =========================================================

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)	

trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp

@@ -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;
 
 
     /* =========================================================

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)	

trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp

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

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)	

trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp

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

trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp

@@ -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;
 
 
     /* =========================================================