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

Package have been updated according to the tests under Windows

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1078 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-03-05 15:55:41 +00:00
commit ae4f880827
18 changed files with 83 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,27 +6,16 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
######################################################################################
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param )
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param
${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson4)
######################################################################################
### 2) Specify where CMake can find the libraries
######################################################################################
IF(NOT WIN32 OR CYGWIN)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BINARY_DIR}/lib)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
ENDIF(NOT WIN32 OR CYGWIN)
# especially for Visual Studio

15
trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp
View file

@ -114,23 +114,8 @@ manage_configuration_file(eoParser & _parser)
{
std::ofstream os;
#ifdef _MSVC
os.open("..\examples\tsp\benchs\berlin52.tsp");
if(os.is_open())
{
_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);
}
os.close();
#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);