Changes in / [1116:bed8011dc6ad:1121:1309a803a057] in lemon
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cmake/FindCOIN.cmake
r1063 r1120 55 55 ) 56 56 57 FIND_LIBRARY(COIN_ZLIB_LIBRARY 58 NAMES z libz 59 HINTS ${COIN_ROOT_DIR}/lib/coin 60 HINTS ${COIN_ROOT_DIR}/lib 61 ) 62 FIND_LIBRARY(COIN_BZ2_LIBRARY 63 NAMES bz2 libbz2 64 HINTS ${COIN_ROOT_DIR}/lib/coin 65 HINTS ${COIN_ROOT_DIR}/lib 66 ) 67 57 68 INCLUDE(FindPackageHandleStandardArgs) 58 69 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG … … 72 83 IF(COIN_FOUND) 73 84 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) 74 SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY}") 75 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}") 76 SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES}) 85 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}") 86 IF(COIN_ZLIB_LIBRARY) 87 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}") 88 ENDIF(COIN_ZLIB_LIBRARY) 89 IF(COIN_BZ2_LIBRARY) 90 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}") 91 ENDIF(COIN_BZ2_LIBRARY) 92 SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY};${COIN_CLP_LIBRARIES}") 93 SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES}) 77 94 ENDIF(COIN_FOUND) 78 95 … … 89 106 COIN_OSI_VOL_LIBRARY 90 107 COIN_VOL_LIBRARY 108 COIN_ZLIB_LIBRARY 109 COIN_BZ2_LIBRARY 91 110 ) 92 111 -
cmake/FindCPLEX.cmake
r683 r1119 3 3 FIND_PATH(CPLEX_INCLUDE_DIR 4 4 ilcplex/cplex.h 5 PATHS "C:/ILOG/CPLEX 91/include"6 PATHS "/opt/ilog/cplex 91/include"5 PATHS "C:/ILOG/CPLEX/include" 6 PATHS "/opt/ilog/cplex/include" 7 7 HINTS ${CPLEX_ROOT_DIR}/include 8 8 ) 9 9 FIND_LIBRARY(CPLEX_LIBRARY 10 cplex 9111 PATHS "C:/ILOG/CPLEX 91/lib/msvc7/stat_mda"12 PATHS "/opt/ilog/cplex 91/bin"10 cplex 11 PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda" 12 PATHS "/opt/ilog/cplex/bin" 13 13 HINTS ${CPLEX_ROOT_DIR}/bin 14 HINTS ${CPLEX_ROOT_DIR}/lib 14 15 ) 15 16 … … 18 19 19 20 FIND_PATH(CPLEX_BIN_DIR 20 cplex91.dll 21 PATHS "C:/ILOG/CPLEX91/bin/x86_win32" 21 cplex.dll 22 PATHS "C:/ILOG/CPLEX/bin/x86_win32" 23 HINTS ${CPLEX_ROOT_DIR}/bin 22 24 ) 23 25 -
lemon/cbc.cc
r623 r1120 26 26 #include <coin/OsiSolverInterface.hpp> 27 27 28 #ifdef COIN_HAS_CLP29 28 #include "coin/OsiClpSolverInterface.hpp" 30 #endif31 #ifdef COIN_HAS_OSL32 #include "coin/OsiOslSolverInterface.hpp"33 #endif34 29 35 30 #include "coin/CbcCutGenerator.hpp" … … 259 254 delete _osi_solver; 260 255 } 261 #ifdef COIN_HAS_CLP262 256 _osi_solver = new OsiClpSolverInterface(); 263 #elif COIN_HAS_OSL264 _osi_solver = new OsiOslSolverInterface();265 #else266 #error Cannot instantiate Osi solver267 #endif268 257 269 258 _osi_solver->loadFromCoinModel(*_prob); … … 317 306 _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover"); 318 307 319 #ifdef COIN_HAS_CLP320 308 OsiClpSolverInterface* osiclp = 321 309 dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver()); … … 323 311 osiclp->setupForRepeatedUse(2, 0); 324 312 } 325 #endif326 313 327 314 CbcRounding heuristic1(*_cbc_model); -
test/CMakeLists.txt
r1069 r1119 83 83 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 84 84 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 85 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex 91.dll ${TARGET_PATH}85 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH} 86 86 ) 87 87 ENDIF() … … 125 125 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 126 126 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 127 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex 91.dll ${TARGET_PATH}127 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH} 128 128 ) 129 129 ENDIF()
Note: See TracChangeset
for help on using the changeset viewer.