Changes in / [974:b1744d7bdb47:971:22201ee8e437] in lemon-main
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cmake/FindCOIN.cmake
r973 r947 55 55 ) 56 56 57 FIND_LIBRARY(COIN_ZLIB_LIBRARY58 NAMES z libz59 HINTS ${COIN_ROOT_DIR}/lib/coin60 HINTS ${COIN_ROOT_DIR}/lib61 )62 FIND_LIBRARY(COIN_BZ2_LIBRARY63 NAMES bz2 libbz264 HINTS ${COIN_ROOT_DIR}/lib/coin65 HINTS ${COIN_ROOT_DIR}/lib66 )67 68 57 INCLUDE(FindPackageHandleStandardArgs) 69 58 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG … … 83 72 IF(COIN_FOUND) 84 73 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) 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}) 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}) 94 77 ENDIF(COIN_FOUND) 95 78 … … 106 89 COIN_OSI_VOL_LIBRARY 107 90 COIN_VOL_LIBRARY 108 COIN_ZLIB_LIBRARY109 COIN_BZ2_LIBRARY110 91 ) 111 92 -
cmake/FindCPLEX.cmake
r972 r636 3 3 FIND_PATH(CPLEX_INCLUDE_DIR 4 4 ilcplex/cplex.h 5 PATHS "C:/ILOG/CPLEX /include"6 PATHS "/opt/ilog/cplex /include"5 PATHS "C:/ILOG/CPLEX91/include" 6 PATHS "/opt/ilog/cplex91/include" 7 7 HINTS ${CPLEX_ROOT_DIR}/include 8 8 ) 9 9 FIND_LIBRARY(CPLEX_LIBRARY 10 cplex 11 PATHS "C:/ILOG/CPLEX /lib/msvc7/stat_mda"12 PATHS "/opt/ilog/cplex /bin"10 cplex91 11 PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda" 12 PATHS "/opt/ilog/cplex91/bin" 13 13 HINTS ${CPLEX_ROOT_DIR}/bin 14 HINTS ${CPLEX_ROOT_DIR}/lib15 14 ) 16 15 … … 19 18 20 19 FIND_PATH(CPLEX_BIN_DIR 21 cplex.dll 22 PATHS "C:/ILOG/CPLEX/bin/x86_win32" 23 HINTS ${CPLEX_ROOT_DIR}/bin 20 cplex91.dll 21 PATHS "C:/ILOG/CPLEX91/bin/x86_win32" 24 22 ) 25 23 -
lemon/cbc.cc
r974 r746 26 26 #include <coin/OsiSolverInterface.hpp> 27 27 28 #ifdef COIN_HAS_CLP 28 29 #include "coin/OsiClpSolverInterface.hpp" 30 #endif 31 #ifdef COIN_HAS_OSL 32 #include "coin/OsiOslSolverInterface.hpp" 33 #endif 29 34 30 35 #include "coin/CbcCutGenerator.hpp" … … 266 271 delete _osi_solver; 267 272 } 273 #ifdef COIN_HAS_CLP 268 274 _osi_solver = new OsiClpSolverInterface(); 275 #elif COIN_HAS_OSL 276 _osi_solver = new OsiOslSolverInterface(); 277 #else 278 #error Cannot instantiate Osi solver 279 #endif 269 280 270 281 _osi_solver->loadFromCoinModel(*_prob); … … 318 329 _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover"); 319 330 331 #ifdef COIN_HAS_CLP 320 332 OsiClpSolverInterface* osiclp = 321 333 dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver()); … … 323 335 osiclp->setupForRepeatedUse(2, 0); 324 336 } 337 #endif 325 338 326 339 CbcRounding heuristic1(*_cbc_model); -
test/CMakeLists.txt
r974 r966 90 90 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 91 91 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 92 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex .dll ${TARGET_PATH}92 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 93 93 ) 94 94 ENDIF() … … 132 132 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 133 133 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 134 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex .dll ${TARGET_PATH}134 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 135 135 ) 136 136 ENDIF()
Note: See TracChangeset
for help on using the changeset viewer.