tutorial update

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

trunk/paradiseo-mo/src/mo.h

@@ -40,12 +40,16 @@
 #include "moAlgo.h"
 #include "moAspirCrit.h"
 #include "moBestImprSelect.h"
+#include "moComparator.h"
 #include "moCoolingSchedule.h"
 #include "moExponentialCoolingSchedule.h"
 #include "moFirstImprSelect.h"
+#include "moFitComparator.h"
+#include "moFitSolContinue.h"
 #include "moGenSolContinue.h"
 #include "moHC.h"
 #include "moHCMoveLoopExpl.h"
+#include "moILS.h"
 #include "moImprBestFitAspirCrit.h"
 #include "moItRandNextMove.h"
 #include "moLinearCoolingSchedule.h"
@@ -58,12 +62,14 @@
 #include "moMoveSelect.h"
 #include "moNextMove.h"
 #include "moNoAspirCrit.h"
+#include "moNoFitImprSolContinue.h"
 #include "moRandImprSelect.h"
 #include "moRandMove.h"
 #include "moSA.h"
 #include "moSimpleMoveTabuList.h"
 #include "moSimpleSolutionTabuList.h"
 #include "moSolContinue.h"
+#include "moSteadyFitSolContinue.h"
 #include "moTabuList.h"
 #include "moTS.h"
 #include "moTSMoveLoopExpl.h"

trunk/paradiseo-mo/tutorial/CMakeLists.txt

@@ -12,6 +12,6 @@ SET(TSP_BINARY_DIR ${ParadisEO-MO_BINARY_DIR}/tutorial/examples/tsp CACHE PATH "
 ### 2) Where must cmake go now ?
 ######################################################################################
 
-SUBDIRS(examples Lesson1 Lesson2 Lesson3)
+SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4)
 
 ######################################################################################

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

@@ -34,17 +34,8 @@
 *
 */
 
-#include <mo.h>
-
-#include <graph.h>
-#include <route.h>
-#include <route_eval.h>
-#include <route_init.h>
-
-#include <two_opt.h>
-#include <two_opt_init.h>
-#include <two_opt_next.h>
-#include <two_opt_incr_eval.h>
+#include <mo>
+#include <tsp>
 
 int
 main (int __argc, char * __argv []) 

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

@@ -34,18 +34,8 @@
 *
 */
 
-#include <mo.h>
-
-#include <graph.h>
-#include <route.h>
-#include <route_eval.h>
-#include <route_init.h>
-
-#include <two_opt.h>
-#include <two_opt_init.h>
-#include <two_opt_next.h>
-#include <two_opt_incr_eval.h>
-#include <two_opt_tabu_list.h>
+#include <mo>
+#include <tsp>
 
 int
 main (int __argc, char * __argv []) 

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

@@ -34,16 +34,8 @@
 *
 */
 
-#include <mo.h>
-
-#include <graph.h>
-#include <route.h>
-#include <route_eval.h>
-#include <route_init.h>
-
-#include <two_opt.h>
-#include <two_opt_rand.h>
-#include <two_opt_incr_eval.h>
+#include <mo>
+#include <tsp>
 
 int
 main (int __argc, char * __argv []) 

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

@@ -9,19 +9,8 @@
    Contact:  paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <mo.h>
-
-#include <graph.h>
-#include <route.h>
-#include <route_eval.h>
-#include <route_init.h>
-
-#include <two_opt.h>
-#include <two_opt_init.h>
-#include <two_opt_next.h>
-#include <two_opt_incr_eval.h>
-
-#include <city_swap.h>
+#include <mo>
+#include <tsp>
 
 int
 main (int __argc, char * __argv []) 

trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt

@@ -33,20 +33,20 @@ SET(TSP_LIB_OUTPUT_PATH ${TSP_BINARY_DIR}/lib)
 SET(LIBRARY_OUTPUT_PATH ${TSP_LIB_OUTPUT_PATH})
 
 SET (TSP_SOURCES 	graph.cpp 
-					route_init.cpp  
-					route_eval.cpp 
-					part_route_eval.cpp 
-					edge_xover.cpp 
-					order_xover.cpp 
-					route_valid.cpp 
-					partial_mapped_xover.cpp 
-					city_swap.cpp 
-					two_opt.cpp	
-					two_opt_init.cpp 
-					two_opt_next.cpp 
-					two_opt_incr_eval.cpp 
-					two_opt_tabu_list.cpp 
-					two_opt_rand.cpp)
+			route_init.cpp  
+			route_eval.cpp 
+			part_route_eval.cpp 
+			edge_xover.cpp 
+			order_xover.cpp 
+			route_valid.cpp 
+			partial_mapped_xover.cpp 
+			city_swap.cpp 
+			two_opt.cpp	
+			two_opt_init.cpp 
+			two_opt_next.cpp 
+			two_opt_incr_eval.cpp 
+			two_opt_tabu_list.cpp 
+			two_opt_rand.cpp)
 					
 ADD_LIBRARY(tsp STATIC ${TSP_SOURCES})