COIN-OR::LEMON - Graph Library

Ignore:
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cmake/FindCOIN.cmake

    r1120 r1063  
    5555)
    5656
    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 
    6857INCLUDE(FindPackageHandleStandardArgs)
    6958FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
     
    8372IF(COIN_FOUND)
    8473  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})
    9477ENDIF(COIN_FOUND)
    9578
     
    10689  COIN_OSI_VOL_LIBRARY
    10790  COIN_VOL_LIBRARY
    108   COIN_ZLIB_LIBRARY
    109   COIN_BZ2_LIBRARY
    11091)
    11192
  • cmake/FindCPLEX.cmake

    r1119 r683  
    33FIND_PATH(CPLEX_INCLUDE_DIR
    44  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"
    77  HINTS ${CPLEX_ROOT_DIR}/include
    88)
    99FIND_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"
    1313  HINTS ${CPLEX_ROOT_DIR}/bin
    14   HINTS ${CPLEX_ROOT_DIR}/lib
    1514)
    1615
     
    1918
    2019FIND_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"
    2422)
    2523
  • lemon/cbc.cc

    r1120 r623  
    2626#include <coin/OsiSolverInterface.hpp>
    2727
     28#ifdef COIN_HAS_CLP
    2829#include "coin/OsiClpSolverInterface.hpp"
     30#endif
     31#ifdef COIN_HAS_OSL
     32#include "coin/OsiOslSolverInterface.hpp"
     33#endif
    2934
    3035#include "coin/CbcCutGenerator.hpp"
     
    254259      delete _osi_solver;
    255260    }
     261#ifdef COIN_HAS_CLP
    256262    _osi_solver = new OsiClpSolverInterface();
     263#elif COIN_HAS_OSL
     264    _osi_solver = new OsiOslSolverInterface();
     265#else
     266#error Cannot instantiate Osi solver
     267#endif
    257268
    258269    _osi_solver->loadFromCoinModel(*_prob);
     
    306317      _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover");
    307318
     319#ifdef COIN_HAS_CLP
    308320      OsiClpSolverInterface* osiclp =
    309321        dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver());
     
    311323        osiclp->setupForRepeatedUse(2, 0);
    312324      }
     325#endif
    313326
    314327      CbcRounding heuristic1(*_cbc_model);
  • test/CMakeLists.txt

    r1119 r1069  
    8383    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    8484    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    85       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     85      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    8686    )
    8787  ENDIF()
     
    125125    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    126126    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    127       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     127      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    128128    )
    129129  ENDIF()
Note: See TracChangeset for help on using the changeset viewer.