From 331874a7bf23bcf3d6f75f9b735d93db14e680f5 Mon Sep 17 00:00:00 2001
From: jboisson <jboisson@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 21 Feb 2008 15:07:00 +0000
Subject: [PATCH] Lessons have been updated

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@994 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../paradiseo-mo/tutorial/Lesson1/CMakeLists.txt |  2 +-
 .../tutorial/Lesson1/hill_climbing.cpp           | 12 +++++++++---
 .../paradiseo-mo/tutorial/Lesson2/CMakeLists.txt |  5 ++---
 .../tutorial/Lesson2/tabu_search.cpp             | 16 +++++++++++-----
 .../paradiseo-mo/tutorial/Lesson3/CMakeLists.txt |  5 ++---
 .../tutorial/Lesson3/simulated_annealing.cpp     |  8 +++++++-
 .../paradiseo-mo/tutorial/Lesson4/CMakeLists.txt |  4 ++--
 .../tutorial/Lesson4/iterated_local_search.cpp   |  8 +++++++-
 8 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
index e57c6c369..df2cfa75d 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
index 62828d4ed..556af08cf 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
@@ -110,11 +110,17 @@ manage_configuration_file(eoParser & _parser)
 {
   std::ofstream os;
 
-  _parser.getORcreateParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+#ifdef _MSVC
+  _parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.", 
 			   0, "Configuration", false);
-  _parser.getORcreateParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
+#else
+  _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+			   0, "Configuration", false);      
+#endif
 
-  _parser.getORcreateParam(std::string("Best"), "selectionType", "Type of the selection: 'Best', 'First' or 'Random'.", 
+  _parser.createParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
+
+  _parser.createParam(std::string("Best"), "selectionType", "Type of the selection: 'Best', 'First' or 'Random'.", 
 			   0, "Configuration", false);
 
   if (_parser.userNeedsHelp())
diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
index 353d5e707..d98fdac27 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 
 ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param )
 
-ADD_CUSTOM_COMMAND(
+ ADD_CUSTOM_COMMAND(
     TARGET install
     POST_BUILD
     COMMAND ${CMAKE_COMMAND}
@@ -20,7 +20,6 @@ ADD_CUSTOM_COMMAND(
       ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param
       ${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson2)
 
-
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
@@ -31,7 +30,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
index df8e6af24..7bce1942c 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
@@ -117,15 +117,21 @@ manage_configuration_file(eoParser & _parser)
 {
   std::ofstream os;
 
-  _parser.getORcreateParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+#ifdef _MSVC
+  _parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.", 
 			   0, "Configuration", false);
-  _parser.getORcreateParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
+#else
+  _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+			   0, "Configuration", false);      
+#endif
 
-  _parser.getORcreateParam((unsigned int)10, "tabuListSize", "Size of the tabu list.", 0, "Configuration", false);
+  _parser.createParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
 
-  _parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);
+  _parser.createParam((unsigned int)10, "tabuListSize", "Size of the tabu list.", 0, "Configuration", false);
 
-  _parser.getORcreateParam(std::string("TwoOpt"), "tabuListType", "Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'.", 
+  _parser.createParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);
+
+  _parser.createParam(std::string("TwoOpt"), "tabuListType", "Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'.", 
 			   0, "Configuration", false);
 
   if (_parser.userNeedsHelp())
diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
index 3e1834af7..1e77e8e39 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 
 ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param )
 
-ADD_CUSTOM_COMMAND(
+  ADD_CUSTOM_COMMAND(
     TARGET install
     POST_BUILD
     COMMAND ${CMAKE_COMMAND}
@@ -20,7 +20,6 @@ ADD_CUSTOM_COMMAND(
       ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param
       ${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson3)
 
-
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
@@ -31,7 +30,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
index 93d393047..313bec11b 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
@@ -114,8 +114,14 @@ manage_configuration_file(eoParser & _parser)
 {
   std::ofstream os;
 
-  _parser.getORcreateParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+#ifdef _MSVC
+  _parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.", 
 			   0, "Configuration", false);
+#else
+  _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+			   0, "Configuration", false);      
+#endif
+
   _parser.getORcreateParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
 
   _parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);
diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
index cd25080d9..ae12142c9 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 
 ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param )
 
-ADD_CUSTOM_COMMAND(
+  ADD_CUSTOM_COMMAND(
     TARGET install
     POST_BUILD
     COMMAND ${CMAKE_COMMAND}
@@ -30,7 +30,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
index fbf6073bf..ffd2c1b4d 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
+++ b/trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
@@ -94,8 +94,14 @@ manage_configuration_file(eoParser & _parser)
 {
   std::ofstream os;
 
-  _parser.getORcreateParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+#ifdef _MSVC
+  _parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.", 
 			   0, "Configuration", false);
+#else
+  _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", 
+			   0, "Configuration", false);      
+#endif
+  
   _parser.getORcreateParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
 
   _parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);