nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lessons have been updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@994 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-02-21 15:07:00 +00:00
commit 331874a7bf
8 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
View file

@ -110,11 +110,17 @@ manage_configuration_file(eoParser & _parser)
{ {
std::ofstream os; 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); 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); 0, "Configuration", false);
if (_parser.userNeedsHelp()) if (_parser.userNeedsHelp())

3
trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
View file

@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param ) ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET install TARGET install
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
@ -20,7 +20,6 @@ ADD_CUSTOM_COMMAND(
${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson2/param
${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson2) ${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson2)
###################################################################################### ######################################################################################
### 2) Specify where CMake can find the libraries ### 2) Specify where CMake can find the libraries
###################################################################################### ######################################################################################

16
trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
View file

@ -117,15 +117,21 @@ manage_configuration_file(eoParser & _parser)
{ {
std::ofstream os; 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); 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); 0, "Configuration", false);
if (_parser.userNeedsHelp()) if (_parser.userNeedsHelp())

3
trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
View file

@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param ) ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET install TARGET install
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
@ -20,7 +20,6 @@ ADD_CUSTOM_COMMAND(
${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson3/param
${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson3) ${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson3)
###################################################################################### ######################################################################################
### 2) Specify where CMake can find the libraries ### 2) Specify where CMake can find the libraries
###################################################################################### ######################################################################################

8
trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
View file

@ -114,8 +114,14 @@ manage_configuration_file(eoParser & _parser)
{ {
std::ofstream os; 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); 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)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
_parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false); _parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);

2
trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
View file

@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param ) ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET install TARGET install
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}

8
trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
View file

@ -94,8 +94,14 @@ manage_configuration_file(eoParser & _parser)
{ {
std::ofstream os; 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); 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)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
_parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false); _parser.getORcreateParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);