Debut du decoupage des leçons: Lesson1 Compile OK

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1736 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-mo/src/problems/eval/oneMaxFullEval.h

@@ -0,0 +1,53 @@
+/*
+<oneMaxFullEval.h>
+Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software.  You can  ue,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and,  more generally, to use and operate it in the
+same conditions as regards security.
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.
+
+ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+Contact: paradiseo-help@lists.gforge.inria.fr
+*/
+
+#ifndef _oneMaxFullEval_h
+#define _oneMaxFullEval_h
+
+/**
+ * Full evalution Function for OneMax problem
+ */
+template< class EOT >
+class oneMaxFullEval : public eoEvalFunc<EOT>
+{
+public:
+
+	/**
+	 * Count the number of 1 in a bitString
+	 * @param _sol the solution to evaluate
+	 */
+    void operator() (EOT& _sol) {
+        unsigned int sum = 0;
+        for (unsigned int i = 0; i < _sol.size(); i++)
+            sum += _sol[i];
+        _sol.fitness(sum);
+    }
+};
+
+#endif

trunk/paradiseo-mo/tutorial/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(oneMax)
+ADD_SUBDIRECTORY(Lesson1)

trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt

@@ -0,0 +1,18 @@
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
+					${MO_SRC_DIR}/src
+					${CMAKE_CURRENT_SOURCE_DIR}/../src)
+					
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib)	
+
+ADD_EXECUTABLE(testSimpleHC testSimpleHC.cpp) 
+ADD_EXECUTABLE(testFirstImpr testFirstImpr.cpp) 
+ADD_EXECUTABLE(testRandomBestHC testRandomBestHC.cpp) 
+ADD_EXECUTABLE(testHCneutral testHCneutral.cpp) 
+
+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) 
+
+
+ 

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

@@ -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/moRndWithoutReplNeighborhood.h>
-#include <oneMaxBitNeighbor.h>
 
 #include <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>
@@ -98,7 +98,7 @@ void main_function(int argc, char **argv)
      *
      * ========================================================= */
 
-    FuncOneMax<Indi> eval(vecSize);
+    oneMaxFullEval<Indi> eval;
 
 
     /* =========================================================

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

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

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

@@ -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 <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>
@@ -98,7 +98,7 @@ void main_function(int argc, char **argv)
      *
      * ========================================================= */
 
-    FuncOneMax<Indi> eval(vecSize);
+    oneMaxFullEval<Indi> eval;
 
 
     /* =========================================================

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

@@ -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 <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>
@@ -98,7 +98,7 @@ void main_function(int argc, char **argv)
      *
      * ========================================================= */
 
-    FuncOneMax<Indi> eval(vecSize);
+    oneMaxFullEval<Indi> eval;
 
 
     /* =========================================================