LEMON/LEMON-main Changeset - r627:20dac2104519

Repositories » LEMON » LEMON-main

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

Changeset - r627:20dac2104519

« 511:8a1444
« 626:58357e

628:586b65 »

r627:20dac2104519

Tue, 28 Apr 2009 14:51:34

[Not Reviewed]

0 comments (0 inline)

ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu

Merge and extend the fix of #275

0 20 0

merge default

20 files changed with 105 insertions and 97 deletions:

CMakeLists.txt

cmake/FindCOIN.cmake

cmake/FindCPLEX.cmake

cmake/FindGLPK.cmake

configure.ac

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/bits/default_map.h

lemon/config.h.cmake

lemon/config.h.in

lemon/lp.h

m4/lx_check_coin.m4

m4/lx_check_cplex.m4

m4/lx_check_glpk.m4

m4/lx_check_soplex.m4

test/CMakeLists.txt

test/lp_test.cc

test/mip_test.cc

tools/dimacs-solver.cc

↑ Collapse diff ↑

0 comments (0 inline)

@@ -30,4 +30,6 @@
 		ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 		INCLUDE(CheckTypeSize)
-		CHECK_TYPE_SIZE("long long" LONG_LONG)
+		CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)

@@ -63,6 +63,6 @@
 		IF(COIN_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
 		  SET(HAVE_CLP TRUE)
 		  SET(HAVE_CBC TRUE)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CLP TRUE)
 		  SET(LEMON_HAVE_CBC TRUE)
 		ENDIF(COIN_FOUND)

@@ -23,5 +23,5 @@
 		IF(CPLEX_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_CPLEX TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CPLEX TRUE)
 		ENDIF(CPLEX_FOUND)

@@ -23,5 +23,5 @@
 		IF(GLPK_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_GLPK TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_GLPK TRUE)
 		ENDIF(GLPK_FOUND)

@@ -20,3 +20,3 @@
-		IF(HAVE_GLPK)
+		IF(LEMON_HAVE_GLPK)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
@@ -28,18 +28,18 @@
 		  ENDIF(WIN32)
-		ENDIF(HAVE_GLPK)
+		ENDIF(LEMON_HAVE_GLPK)
-		IF(HAVE_CPLEX)
+		IF(LEMON_HAVE_CPLEX)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
 		  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
-		ENDIF(HAVE_CPLEX)
+		ENDIF(LEMON_HAVE_CPLEX)
-		IF(HAVE_CLP)
+		IF(LEMON_HAVE_CLP)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CLP)
+		ENDIF(LEMON_HAVE_CLP)
-		IF(HAVE_CBC)
+		IF(LEMON_HAVE_CBC)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CBC)
+		ENDIF(LEMON_HAVE_CBC)
@@ -57,1 +57,6 @@
 		  FILES_MATCHING PATTERN "*.h")
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers)

RhodeCode

Login to your account

@@ -27,3 +27,3 @@
 		if test x"$long_long_found" = x"yes"; then
-		  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+		  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 		fi

@@ -63,2 +63,3 @@
 			lemon/concept_check.h \
 			lemon/config.h \
 			lemon/connectivity.h \

@@ -99,3 +99,3 @@
-		#if defined HAVE_LONG_LONG
+		#if defined LEMON_HAVE_LONG_LONG

 		#cmakedefine HAVE_LONG_LONG 1
 		#cmakedefine HAVE_LP 1
 		#cmakedefine HAVE_MIP 1
 		#cmakedefine HAVE_GLPK 1
 		#cmakedefine HAVE_CPLEX 1
 		#cmakedefine HAVE_CLP 1
-		#cmakedefine HAVE_CBC 1
+		#cmakedefine LEMON_HAVE_LONG_LONG 1
 		#cmakedefine LEMON_HAVE_LP 1
 		#cmakedefine LEMON_HAVE_MIP 1
 		#cmakedefine LEMON_HAVE_GLPK 1
 		#cmakedefine LEMON_HAVE_CPLEX 1
 		#cmakedefine LEMON_HAVE_CLP 1
 		#cmakedefine LEMON_HAVE_CBC 1

 		/* Define to 1 if you have long long */
-		#undef HAVE_LONG_LONG
+		#undef LEMON_HAVE_LONG_LONG
 		/* Define to 1 if you have any LP solver. */
-		#undef HAVE_LP
+		#undef LEMON_HAVE_LP
 		/* Define to 1 if you have any MIP solver. */
-		#undef HAVE_MIP
+		#undef LEMON_HAVE_MIP
 		/* Define to 1 if you have CPLEX. */
-		#undef HAVE_CPLEX
+		#undef LEMON_HAVE_CPLEX
 		/* Define to 1 if you have GLPK. */
-		#undef HAVE_GLPK
+		#undef LEMON_HAVE_GLPK
 		/* Define to 1 if you have SOPLEX */
-		#undef HAVE_SOPLEX
+		#undef LEMON_HAVE_SOPLEX
 		/* Define to 1 if you have CLP */
-		#undef HAVE_CLP
+		#undef LEMON_HAVE_CLP
 		/* Define to 1 if you have CBC */
-		#undef HAVE_CBC
+		#undef LEMON_HAVE_CBC

@@ -24,9 +24,9 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		#include <lemon/clp.h>
@@ -71,3 +71,3 @@
 		#else
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		# define LEMON_DEFAULT_LP GLPK
@@ -76,3 +76,3 @@
 		  typedef GlpkMip Mip;
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		# define LEMON_DEFAULT_LP CPLEX
@@ -81,6 +81,6 @@
 		  typedef CplexMip Mip;
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		# define DEFAULT_LP SOPLEX
 		  typedef SoplexLp Lp;
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		# define DEFAULT_LP CLP

@@ -57,5 +57,5 @@
 		    if test x"$lx_clp_found" = x"yes"; then
-		      AC_DEFINE([HAVE_CLP], [1], [Define to 1 if you have CLP.])
+		      AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      AC_MSG_RESULT([yes])
@@ -117,7 +117,7 @@
 		      if test x"$lx_cbc_found" = x"yes"; then
-		        AC_DEFINE([HAVE_CBC], [1], [Define to 1 if you have CBC.])
+		        AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
 		        lx_lp_found=yes
-		        AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		        AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		        lx_mip_found=yes
-		        AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+		        AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
 		        AC_MSG_RESULT([yes])

@@ -38,14 +38,14 @@
-		IF(HAVE_LP)
+		IF(LEMON_HAVE_LP)
 		  ADD_EXECUTABLE(lp_test lp_test.cc)
 		  SET(LP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CLP)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CLP)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-		  ENDIF(HAVE_CLP)
+		  ENDIF(LEMON_HAVE_CLP)
 		  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
@@ -53,3 +53,3 @@
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
@@ -61,4 +61,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
@@ -68,17 +68,17 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_LP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_LP)
-		IF(HAVE_MIP)
+		IF(LEMON_HAVE_MIP)
 		  ADD_EXECUTABLE(mip_test mip_test.cc)
 		  SET(MIP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CBC)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CBC)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-		  ENDIF(HAVE_CBC)
+		  ENDIF(LEMON_HAVE_CBC)
 		  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
@@ -86,3 +86,3 @@
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
@@ -94,4 +94,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
@@ -101,4 +101,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_MIP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_MIP)

@@ -27,3 +27,3 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
@@ -31,3 +31,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
@@ -35,3 +35,3 @@
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
@@ -39,3 +39,3 @@
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
 		#include <lemon/clp.h>
@@ -381,3 +381,3 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
+		  {
@@ -390,3 +390,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		  try {
@@ -401,3 +401,3 @@
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
+		  {
@@ -410,3 +410,3 @@
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
+		  {

@@ -24,3 +24,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
@@ -28,3 +28,3 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
@@ -32,3 +32,3 @@
-		#ifdef HAVE_CBC
+		#ifdef LEMON_HAVE_CBC
 		#include <lemon/cbc.h>
@@ -131,3 +131,3 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
+		  {
@@ -139,3 +139,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		  try {
@@ -149,3 +149,3 @@
-		#ifdef HAVE_CBC
+		#ifdef LEMON_HAVE_CBC
+		  {

@@ -202,3 +202,3 @@
 		    .optionGroup("datatype","int")
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		    .boolOption("long","Use 'long long' for capacities, costs etc.")
@@ -269,3 +269,3 @@
 		    solve<long double>(ap,is,os,desc);
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		  else if(ap.given("long"))