Changes in / [626:58357e986a08:627:20dac2104519] in lemon-main
- Files:
-
- 19 edited
-
CMakeLists.txt (modified) (1 diff)
-
cmake/FindCOIN.cmake (modified) (1 diff)
-
cmake/FindCPLEX.cmake (modified) (1 diff)
-
cmake/FindGLPK.cmake (modified) (1 diff)
-
configure.ac (modified) (1 diff)
-
lemon/CMakeLists.txt (modified) (3 diffs)
-
lemon/Makefile.am (modified) (1 diff)
-
lemon/bits/default_map.h (modified) (1 diff)
-
lemon/config.h.cmake (modified) (1 diff)
-
lemon/config.h.in (modified) (1 diff)
-
lemon/lp.h (modified) (2 diffs)
-
m4/lx_check_coin.m4 (modified) (2 diffs)
-
m4/lx_check_cplex.m4 (modified) (1 diff)
-
m4/lx_check_glpk.m4 (modified) (1 diff)
-
m4/lx_check_soplex.m4 (modified) (1 diff)
-
test/CMakeLists.txt (modified) (5 diffs)
-
test/lp_test.cc (modified) (5 diffs)
-
test/mip_test.cc (modified) (4 diffs)
-
tools/dimacs-solver.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r621 r627 29 29 ENDIF(MSVC) 30 30 31 ADD_DEFINITIONS(-DHAVE_CONFIG_H) 32 31 33 INCLUDE(CheckTypeSize) 32 CHECK_TYPE_SIZE("long long" L ONG_LONG)34 CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) 33 35 34 36 ENABLE_TESTING() -
cmake/FindCOIN.cmake
r621 r627 62 62 63 63 IF(COIN_FOUND) 64 SET( HAVE_LP TRUE)65 SET( HAVE_MIP TRUE)66 SET( HAVE_CLP TRUE)67 SET( HAVE_CBC TRUE)64 SET(LEMON_HAVE_LP TRUE) 65 SET(LEMON_HAVE_MIP TRUE) 66 SET(LEMON_HAVE_CLP TRUE) 67 SET(LEMON_HAVE_CBC TRUE) 68 68 ENDIF(COIN_FOUND) -
cmake/FindCPLEX.cmake
r620 r627 22 22 23 23 IF(CPLEX_FOUND) 24 SET( HAVE_LP TRUE)25 SET( HAVE_MIP TRUE)26 SET( HAVE_CPLEX TRUE)24 SET(LEMON_HAVE_LP TRUE) 25 SET(LEMON_HAVE_MIP TRUE) 26 SET(LEMON_HAVE_CPLEX TRUE) 27 27 ENDIF(CPLEX_FOUND) -
cmake/FindGLPK.cmake
r619 r627 22 22 23 23 IF(GLPK_FOUND) 24 SET( HAVE_LP TRUE)25 SET( HAVE_MIP TRUE)26 SET( HAVE_GLPK TRUE)24 SET(LEMON_HAVE_LP TRUE) 25 SET(LEMON_HAVE_MIP TRUE) 26 SET(LEMON_HAVE_GLPK TRUE) 27 27 ENDIF(GLPK_FOUND) -
configure.ac
r568 r627 26 26 AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no]) 27 27 if test x"$long_long_found" = x"yes"; then 28 AC_DEFINE([ HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])28 AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.]) 29 29 fi 30 30 -
lemon/CMakeLists.txt
r621 r627 19 19 ) 20 20 21 IF( HAVE_GLPK)21 IF(LEMON_HAVE_GLPK) 22 22 SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc) 23 23 INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS}) … … 27 27 INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin) 28 28 ENDIF(WIN32) 29 ENDIF( HAVE_GLPK)29 ENDIF(LEMON_HAVE_GLPK) 30 30 31 IF( HAVE_CPLEX)31 IF(LEMON_HAVE_CPLEX) 32 32 SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc) 33 33 INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS}) 34 ENDIF( HAVE_CPLEX)34 ENDIF(LEMON_HAVE_CPLEX) 35 35 36 IF( HAVE_CLP)36 IF(LEMON_HAVE_CLP) 37 37 SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc) 38 38 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 39 ENDIF( HAVE_CLP)39 ENDIF(LEMON_HAVE_CLP) 40 40 41 IF( HAVE_CBC)41 IF(LEMON_HAVE_CBC) 42 42 SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc) 43 43 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 44 ENDIF( HAVE_CBC)44 ENDIF(LEMON_HAVE_CBC) 45 45 46 46 ADD_LIBRARY(lemon ${LEMON_SOURCES}) … … 56 56 COMPONENT headers 57 57 FILES_MATCHING PATTERN "*.h") 58 59 INSTALL( 60 FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h 61 DESTINATION include/lemon 62 COMPONENT headers) -
lemon/Makefile.am
r611 r627 62 62 lemon/color.h \ 63 63 lemon/concept_check.h \ 64 lemon/config.h \ 64 65 lemon/connectivity.h \ 65 66 lemon/counter.h \ -
lemon/bits/default_map.h
r617 r627 98 98 99 99 100 #if defined HAVE_LONG_LONG100 #if defined LEMON_HAVE_LONG_LONG 101 101 102 102 // long long -
lemon/config.h.cmake
r621 r627 1 #cmakedefine HAVE_LONG_LONG 12 #cmakedefine HAVE_LP 13 #cmakedefine HAVE_MIP 14 #cmakedefine HAVE_GLPK 15 #cmakedefine HAVE_CPLEX 16 #cmakedefine HAVE_CLP 17 #cmakedefine HAVE_CBC 11 #cmakedefine LEMON_HAVE_LONG_LONG 1 2 #cmakedefine LEMON_HAVE_LP 1 3 #cmakedefine LEMON_HAVE_MIP 1 4 #cmakedefine LEMON_HAVE_GLPK 1 5 #cmakedefine LEMON_HAVE_CPLEX 1 6 #cmakedefine LEMON_HAVE_CLP 1 7 #cmakedefine LEMON_HAVE_CBC 1 -
lemon/config.h.in
r567 r627 1 1 /* Define to 1 if you have long long */ 2 #undef HAVE_LONG_LONG2 #undef LEMON_HAVE_LONG_LONG 3 3 4 4 /* Define to 1 if you have any LP solver. */ 5 #undef HAVE_LP5 #undef LEMON_HAVE_LP 6 6 7 7 /* Define to 1 if you have any MIP solver. */ 8 #undef HAVE_MIP8 #undef LEMON_HAVE_MIP 9 9 10 10 /* Define to 1 if you have CPLEX. */ 11 #undef HAVE_CPLEX11 #undef LEMON_HAVE_CPLEX 12 12 13 13 /* Define to 1 if you have GLPK. */ 14 #undef HAVE_GLPK14 #undef LEMON_HAVE_GLPK 15 15 16 16 /* Define to 1 if you have SOPLEX */ 17 #undef HAVE_SOPLEX17 #undef LEMON_HAVE_SOPLEX 18 18 19 19 /* Define to 1 if you have CLP */ 20 #undef HAVE_CLP20 #undef LEMON_HAVE_CLP 21 21 22 22 /* Define to 1 if you have CBC */ 23 #undef HAVE_CBC23 #undef LEMON_HAVE_CBC -
lemon/lp.h
r462 r627 23 23 24 24 25 #ifdef HAVE_GLPK25 #ifdef LEMON_HAVE_GLPK 26 26 #include <lemon/glpk.h> 27 #elif HAVE_CPLEX27 #elif LEMON_HAVE_CPLEX 28 28 #include <lemon/cplex.h> 29 #elif HAVE_SOPLEX29 #elif LEMON_HAVE_SOPLEX 30 30 #include <lemon/soplex.h> 31 #elif HAVE_CLP31 #elif LEMON_HAVE_CLP 32 32 #include <lemon/clp.h> 33 33 #endif … … 70 70 typedef GlpkMip Mip; 71 71 #else 72 #ifdef HAVE_GLPK72 #ifdef LEMON_HAVE_GLPK 73 73 # define LEMON_DEFAULT_LP GLPK 74 74 typedef GlpkLp Lp; 75 75 # define LEMON_DEFAULT_MIP GLPK 76 76 typedef GlpkMip Mip; 77 #elif HAVE_CPLEX77 #elif LEMON_HAVE_CPLEX 78 78 # define LEMON_DEFAULT_LP CPLEX 79 79 typedef CplexLp Lp; 80 80 # define LEMON_DEFAULT_MIP CPLEX 81 81 typedef CplexMip Mip; 82 #elif HAVE_SOPLEX82 #elif LEMON_HAVE_SOPLEX 83 83 # define DEFAULT_LP SOPLEX 84 84 typedef SoplexLp Lp; 85 #elif HAVE_CLP85 #elif LEMON_HAVE_CLP 86 86 # define DEFAULT_LP CLP 87 87 typedef ClpLp Lp; -
m4/lx_check_coin.m4
r568 r627 56 56 57 57 if test x"$lx_clp_found" = x"yes"; then 58 AC_DEFINE([ HAVE_CLP], [1], [Define to 1 if you have CLP.])58 AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.]) 59 59 lx_lp_found=yes 60 AC_DEFINE([ HAVE_LP], [1], [Define to 1 if you have any LP solver.])60 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 61 61 AC_MSG_RESULT([yes]) 62 62 else … … 116 116 117 117 if test x"$lx_cbc_found" = x"yes"; then 118 AC_DEFINE([ HAVE_CBC], [1], [Define to 1 if you have CBC.])118 AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.]) 119 119 lx_lp_found=yes 120 AC_DEFINE([ HAVE_LP], [1], [Define to 1 if you have any LP solver.])120 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 121 121 lx_mip_found=yes 122 AC_DEFINE([ HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])122 AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) 123 123 AC_MSG_RESULT([yes]) 124 124 else -
m4/lx_check_cplex.m4
r457 r627 62 62 63 63 if test x"$lx_cplex_found" = x"yes"; then 64 AC_DEFINE([ HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])64 AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) 65 65 lx_lp_found=yes 66 AC_DEFINE([ HAVE_LP], [1], [Define to 1 if you have any LP solver.])66 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 67 67 lx_mip_found=yes 68 AC_DEFINE([ HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])68 AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) 69 69 AC_MSG_RESULT([yes]) 70 70 else -
m4/lx_check_glpk.m4
r459 r627 65 65 66 66 if test x"$lx_glpk_found" = x"yes"; then 67 AC_DEFINE([ HAVE_GLPK], [1], [Define to 1 if you have GLPK.])67 AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) 68 68 lx_lp_found=yes 69 AC_DEFINE([ HAVE_LP], [1], [Define to 1 if you have any LP solver.])69 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 70 70 lx_mip_found=yes 71 AC_DEFINE([ HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])71 AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) 72 72 AC_MSG_RESULT([yes]) 73 73 else -
m4/lx_check_soplex.m4
r539 r627 56 56 57 57 if test x"$lx_soplex_found" = x"yes"; then 58 AC_DEFINE([ HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])58 AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) 59 59 lx_lp_found=yes 60 AC_DEFINE([ HAVE_LP], [1], [Define to 1 if you have any LP solver.])60 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 61 61 AC_MSG_RESULT([yes]) 62 62 else -
test/CMakeLists.txt
r621 r627 37 37 unionfind_test) 38 38 39 IF( HAVE_LP)39 IF(LEMON_HAVE_LP) 40 40 ADD_EXECUTABLE(lp_test lp_test.cc) 41 41 SET(LP_TEST_LIBS lemon) 42 IF( HAVE_GLPK)42 IF(LEMON_HAVE_GLPK) 43 43 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) 44 ENDIF( HAVE_GLPK)45 IF( HAVE_CPLEX)44 ENDIF(LEMON_HAVE_GLPK) 45 IF(LEMON_HAVE_CPLEX) 46 46 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) 47 ENDIF( HAVE_CPLEX)48 IF( HAVE_CLP)47 ENDIF(LEMON_HAVE_CPLEX) 48 IF(LEMON_HAVE_CLP) 49 49 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) 50 ENDIF( HAVE_CLP)50 ENDIF(LEMON_HAVE_CLP) 51 51 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) 52 52 ADD_TEST(lp_test lp_test) 53 53 54 IF(WIN32 AND HAVE_GLPK)54 IF(WIN32 AND LEMON_HAVE_GLPK) 55 55 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 56 56 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) … … 60 60 COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 61 61 ) 62 ENDIF(WIN32 AND HAVE_GLPK)63 IF(WIN32 AND HAVE_CPLEX)62 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 63 IF(WIN32 AND LEMON_HAVE_CPLEX) 64 64 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 65 65 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) … … 67 67 COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 68 68 ) 69 ENDIF(WIN32 AND HAVE_CPLEX)70 ENDIF( HAVE_LP)69 ENDIF(WIN32 AND LEMON_HAVE_CPLEX) 70 ENDIF(LEMON_HAVE_LP) 71 71 72 IF( HAVE_MIP)72 IF(LEMON_HAVE_MIP) 73 73 ADD_EXECUTABLE(mip_test mip_test.cc) 74 74 SET(MIP_TEST_LIBS lemon) 75 IF( HAVE_GLPK)75 IF(LEMON_HAVE_GLPK) 76 76 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) 77 ENDIF( HAVE_GLPK)78 IF( HAVE_CPLEX)77 ENDIF(LEMON_HAVE_GLPK) 78 IF(LEMON_HAVE_CPLEX) 79 79 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) 80 ENDIF( HAVE_CPLEX)81 IF( HAVE_CBC)80 ENDIF(LEMON_HAVE_CPLEX) 81 IF(LEMON_HAVE_CBC) 82 82 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) 83 ENDIF( HAVE_CBC)83 ENDIF(LEMON_HAVE_CBC) 84 84 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) 85 85 ADD_TEST(mip_test mip_test) 86 86 87 IF(WIN32 AND HAVE_GLPK)87 IF(WIN32 AND LEMON_HAVE_GLPK) 88 88 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 89 89 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) … … 93 93 COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 94 94 ) 95 ENDIF(WIN32 AND HAVE_GLPK)96 IF(WIN32 AND HAVE_CPLEX)95 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 96 IF(WIN32 AND LEMON_HAVE_CPLEX) 97 97 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 98 98 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) … … 100 100 COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 101 101 ) 102 ENDIF(WIN32 AND HAVE_CPLEX)103 ENDIF( HAVE_MIP)102 ENDIF(WIN32 AND LEMON_HAVE_CPLEX) 103 ENDIF(LEMON_HAVE_MIP) 104 104 105 105 FOREACH(TEST_NAME ${TESTS}) -
test/lp_test.cc
r575 r627 26 26 #endif 27 27 28 #ifdef HAVE_GLPK28 #ifdef LEMON_HAVE_GLPK 29 29 #include <lemon/glpk.h> 30 30 #endif 31 31 32 #ifdef HAVE_CPLEX32 #ifdef LEMON_HAVE_CPLEX 33 33 #include <lemon/cplex.h> 34 34 #endif 35 35 36 #ifdef HAVE_SOPLEX36 #ifdef LEMON_HAVE_SOPLEX 37 37 #include <lemon/soplex.h> 38 38 #endif 39 39 40 #ifdef HAVE_CLP40 #ifdef LEMON_HAVE_CLP 41 41 #include <lemon/clp.h> 42 42 #endif … … 380 380 lpTest(lp_skel); 381 381 382 #ifdef HAVE_GLPK382 #ifdef LEMON_HAVE_GLPK 383 383 { 384 384 GlpkLp lp_glpk1,lp_glpk2; … … 389 389 #endif 390 390 391 #ifdef HAVE_CPLEX391 #ifdef LEMON_HAVE_CPLEX 392 392 try { 393 393 CplexLp lp_cplex1,lp_cplex2; … … 400 400 #endif 401 401 402 #ifdef HAVE_SOPLEX402 #ifdef LEMON_HAVE_SOPLEX 403 403 { 404 404 SoplexLp lp_soplex1,lp_soplex2; … … 409 409 #endif 410 410 411 #ifdef HAVE_CLP411 #ifdef LEMON_HAVE_CLP 412 412 { 413 413 ClpLp lp_clp1,lp_clp2; -
test/mip_test.cc
r575 r627 23 23 #endif 24 24 25 #ifdef HAVE_CPLEX25 #ifdef LEMON_HAVE_CPLEX 26 26 #include <lemon/cplex.h> 27 27 #endif 28 28 29 #ifdef HAVE_GLPK29 #ifdef LEMON_HAVE_GLPK 30 30 #include <lemon/glpk.h> 31 31 #endif 32 32 33 #ifdef HAVE_CBC33 #ifdef LEMON_HAVE_CBC 34 34 #include <lemon/cbc.h> 35 35 #endif … … 130 130 { 131 131 132 #ifdef HAVE_GLPK132 #ifdef LEMON_HAVE_GLPK 133 133 { 134 134 GlpkMip mip1; … … 138 138 #endif 139 139 140 #ifdef HAVE_CPLEX140 #ifdef LEMON_HAVE_CPLEX 141 141 try { 142 142 CplexMip mip2; … … 148 148 #endif 149 149 150 #ifdef HAVE_CBC150 #ifdef LEMON_HAVE_CBC 151 151 { 152 152 CbcMip mip1; -
tools/dimacs-solver.cc
r614 r627 201 201 .boolOption("int","Use 'int' for capacities, costs etc. (default)") 202 202 .optionGroup("datatype","int") 203 #ifdef HAVE_LONG_LONG203 #ifdef LEMON_HAVE_LONG_LONG 204 204 .boolOption("long","Use 'long long' for capacities, costs etc.") 205 205 .optionGroup("datatype","long") … … 268 268 else if(ap.given("ldouble")) 269 269 solve<long double>(ap,is,os,desc); 270 #ifdef HAVE_LONG_LONG270 #ifdef LEMON_HAVE_LONG_LONG 271 271 else if(ap.given("long")) 272 272 solve<long long>(ap,is,os,desc);
Note: See TracChangeset
for help on using the changeset viewer.
