From ecbc80f577333f5c419ed8bfc230882f9f7468cd Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 8 Apr 2010 15:58:08 +0000
Subject: [PATCH] =?UTF-8?q?Decoupage=20du=20reste=20des=20le=C3=A7ons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1737 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-mo/tutorial/CMakeLists.txt         |  8 +++++++-
 trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt |  3 ---
 trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt |  0
 trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt |  9 +++++++++
 .../tutorial/Lesson3/testSimulatedAnnealing.cpp    |  6 +++---
 trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt |  9 +++++++++
 .../paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp |  6 +++---
 trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt |  9 +++++++++
 trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp    |  7 +++----
 trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt | 14 ++++++++++++++
 .../tutorial/Lesson6/testMetropolisHasting.cpp     |  6 +++---
 .../tutorial/Lesson6/testRandomNeutralWalk.cpp     |  2 +-
 .../tutorial/Lesson6/testRandomWalk.cpp            |  6 +++---
 trunk/paradiseo-mo/tutorial/Lesson7/CMakeLists.txt |  0
 14 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt
 create mode 100644 trunk/paradiseo-mo/tutorial/Lesson7/CMakeLists.txt

diff --git a/trunk/paradiseo-mo/tutorial/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/CMakeLists.txt
index b242b3b36..6ffaa8f1a 100644
--- a/trunk/paradiseo-mo/tutorial/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/CMakeLists.txt
@@ -1 +1,7 @@
-ADD_SUBDIRECTORY(Lesson1)
\ No newline at end of file
+ADD_SUBDIRECTORY(Lesson1)
+ADD_SUBDIRECTORY(Lesson2)
+ADD_SUBDIRECTORY(Lesson3)
+ADD_SUBDIRECTORY(Lesson4)
+ADD_SUBDIRECTORY(Lesson5)
+ADD_SUBDIRECTORY(Lesson6)
+ADD_SUBDIRECTORY(Lesson7)
\ No newline at end of file
diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
index 5156da175..8fbb5a4f9 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
@@ -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) 
-
-
- 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
new file mode 100644
index 000000000..2e04ecf11
--- /dev/null
+++ b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
@@ -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) 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp
index 46ef2714e..31ccd7352 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.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/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;
 
 
     /* =========================================================
diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
new file mode 100644
index 000000000..dfc071a50
--- /dev/null
+++ b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
@@ -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)
diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp b/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp
index e393b07b2..4fcdd6c8e 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.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 <mo>
 
@@ -100,7 +100,7 @@ void main_function(int argc, char **argv)
      *
      * ========================================================= */
 
-    FuncOneMax<Indi> fulleval(vecSize);
+    oneMaxFullEval<Indi> fulleval;
 
 
     /* =========================================================
diff --git a/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
new file mode 100644
index 000000000..2b619810e
--- /dev/null
+++ b/trunk/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
@@ -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) 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp b/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp
index 0c1866056..9745a6d65 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson5/testILS.cpp
@@ -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);
 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt
new file mode 100644
index 000000000..eb3f3b2ad
--- /dev/null
+++ b/trunk/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt
@@ -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)
diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp
index 37804e0d6..cf3c85b5a 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.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/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;
 
 
     /* =========================================================
diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.cpp
index 9551ddcfc..7d76495d4 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.cpp
@@ -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>
diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp
index 508e91d70..7b020d229 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.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/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;
 
 
     /* =========================================================
diff --git a/trunk/paradiseo-mo/tutorial/Lesson7/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson7/CMakeLists.txt
new file mode 100644
index 000000000..e69de29bb