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

4
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_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)
######################################################################################

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

@ -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);