LEMON/LEMON-official Changeset - r1121:1309a803a057

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r1121:1309a803a057

« 1120:ee581a
« 1116:bed801

1126:a30455 »

r1121:1309a803a057

Wed, 11 Jan 2012 13:58:30

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge LP interface updates to branch 1.1

0 4 0

merge 1.1

0 files changed with 33 insertions and 25 deletions:

cmake/FindCOIN.cmake

cmake/FindCPLEX.cmake

lemon/cbc.cc

test/CMakeLists.txt

↑ Collapse diff ↑

cmake/FindCOIN.cmake

Show inline comments

@@ -49,16 +49,27 @@
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_VOL_LIBRARY
 		  NAMES Vol libVol
 		  HINTS ${COIN_ROOT_DIR}/lib/coin
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_ZLIB_LIBRARY
 		  NAMES z libz
 		  HINTS ${COIN_ROOT_DIR}/lib/coin
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_BZ2_LIBRARY
 		  NAMES bz2 libbz2
 		  HINTS ${COIN_ROOT_DIR}/lib/coin
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
 		  COIN_INCLUDE_DIR
 		  COIN_CBC_LIBRARY
 		  COIN_CBC_SOLVER_LIBRARY
 		  COIN_CGL_LIBRARY
 		  COIN_CLP_LIBRARY
 		  COIN_COIN_UTILS_LIBRARY
@@ -66,33 +77,41 @@
 		  COIN_OSI_CBC_LIBRARY
 		  COIN_OSI_CLP_LIBRARY
 		  # COIN_OSI_VOL_LIBRARY
 		  # COIN_VOL_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
 		  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}")
 		  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
-		  SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
+		  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}")
 		  IF(COIN_ZLIB_LIBRARY)
 		    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
 		  ENDIF(COIN_ZLIB_LIBRARY)
 		   IF(COIN_BZ2_LIBRARY)
 		    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
 		  ENDIF(COIN_BZ2_LIBRARY)
 		  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}")
 		  SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
 		ENDIF(COIN_FOUND)
 		MARK_AS_ADVANCED(
 		  COIN_INCLUDE_DIR
 		  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
 		  COIN_OSI_VOL_LIBRARY
 		  COIN_VOL_LIBRARY
 		  COIN_ZLIB_LIBRARY
 		  COIN_BZ2_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CLP TRUE)
 		  SET(LEMON_HAVE_CBC TRUE)
 		ENDIF(COIN_FOUND)

cmake/FindCPLEX.cmake

Show inline comments

 		SET(CPLEX_ROOT_DIR "" CACHE PATH "CPLEX root directory")
 		FIND_PATH(CPLEX_INCLUDE_DIR
 		  ilcplex/cplex.h
 		  PATHS "C:/ILOG/CPLEX91/include"
 		  PATHS "/opt/ilog/cplex91/include"
 		  PATHS "C:/ILOG/CPLEX/include"
 		  PATHS "/opt/ilog/cplex/include"
 		  HINTS ${CPLEX_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(CPLEX_LIBRARY
 		  cplex91
 		  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
-		  PATHS "/opt/ilog/cplex91/bin"
+		  cplex
 		  PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda"
 		  PATHS "/opt/ilog/cplex/bin"
 		  HINTS ${CPLEX_ROOT_DIR}/bin
 		  HINTS ${CPLEX_ROOT_DIR}/lib
+		)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR)
 		FIND_PATH(CPLEX_BIN_DIR
 		  cplex91.dll
 		  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
 		  cplex.dll
 		  PATHS "C:/ILOG/CPLEX/bin/x86_win32"
 		  HINTS ${CPLEX_ROOT_DIR}/bin
+		)
 		IF(CPLEX_FOUND)
 		  SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR})
 		  SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY})
 		  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		    SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
 		  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")

lemon/cbc.cc

Show inline comments

@@ -20,22 +20,17 @@
 		///\brief Implementation of the CBC MIP solver interface.
 		#include "cbc.h"
 		#include <coin/CoinModel.hpp>
 		#include <coin/CbcModel.hpp>
 		#include <coin/OsiSolverInterface.hpp>
 		#ifdef COIN_HAS_CLP
 		#include "coin/OsiClpSolverInterface.hpp"
 		#endif
 		#ifdef COIN_HAS_OSL
 		#include "coin/OsiOslSolverInterface.hpp"
 		#endif
 		#include "coin/CbcCutGenerator.hpp"
 		#include "coin/CbcHeuristicLocal.hpp"
 		#include "coin/CbcHeuristicGreedy.hpp"
 		#include "coin/CbcHeuristicFPump.hpp"
 		#include "coin/CbcHeuristicRINS.hpp"
 		#include "coin/CglGomory.hpp"
@@ -253,23 +248,17 @@
 		    return _prob->getColumnObjective(i);
+		  }
 		  CbcMip::SolveExitStatus CbcMip::_solve() {
 		    if (_osi_solver) {
 		      delete _osi_solver;
+		    }
 		#ifdef COIN_HAS_CLP
 		    _osi_solver = new OsiClpSolverInterface();
 		#elif COIN_HAS_OSL
 		    _osi_solver = new OsiOslSolverInterface();
 		#else
 		#error Cannot instantiate Osi solver
 		#endif
 		    _osi_solver->loadFromCoinModel(*_prob);
 		    if (_cbc_model) {
 		      delete _cbc_model;
+		    }
 		    _cbc_model= new CbcModel(*_osi_solver);
@@ -311,23 +300,21 @@
 		      _cbc_model->addCutGenerator(&generator5, -1, "Clique");
 		      CglMixedIntegerRounding mixedGen;
 		      _cbc_model->addCutGenerator(&mixedGen, -1, "MixedIntegerRounding");
 		      CglFlowCover flowGen;
 		      _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover");
 		#ifdef COIN_HAS_CLP
 		      OsiClpSolverInterface* osiclp =
 		        dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver());
 		      if (osiclp->getNumRows() < 300 && osiclp->getNumCols() < 500) {
 		        osiclp->setupForRepeatedUse(2, 0);
+		      }
 		#endif
 		      CbcRounding heuristic1(*_cbc_model);
 		      heuristic1.setWhen(3);
 		      _cbc_model->addHeuristic(&heuristic1);
 		      CbcHeuristicLocal heuristic2(*_cbc_model);
 		      heuristic2.setWhen(3);
 		      _cbc_model->addHeuristic(&heuristic2);

test/CMakeLists.txt

Show inline comments

@@ -77,17 +77,17 @@
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
 		  ENDIF()
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
-		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
+		    )
 		  ENDIF()
 		ENDIF()
 		IF(LEMON_HAVE_MIP)
 		  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
 		    ADD_EXECUTABLE(mip_test mip_test.cc)
 		  ELSE()
@@ -119,17 +119,17 @@
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
 		  ENDIF()
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
-		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
+		    )
 		  ENDIF()
 		ENDIF()
 		FOREACH(TEST_NAME ${TESTS})
 		  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
 		    ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
 		  ELSE()

0 comments (0 inline)

RhodeCode

Login to your account