Changeset 674:20dac2104519 in lemon
- Timestamp:
- 04/28/09 14:51:34 (15 years ago)
- Branch:
- default
- Parents:
- 673:58357e986a08 (diff), 540:8a144437db7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r540 r674 10 10 PROJECT(${PROJECT_NAME}) 11 11 12 SET(CMAKE_MODULE_PATH ${ CMAKE_SOURCE_DIR}/cmake)12 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) 13 13 14 14 INCLUDE(FindDoxygen) 15 15 INCLUDE(FindGhostscript) 16 FIND_PACKAGE(GLPK 4.33) 17 FIND_PACKAGE(CPLEX) 18 FIND_PACKAGE(COIN) 19 20 ADD_DEFINITIONS(-DHAVE_CONFIG_H) 21 22 IF(MSVC) 23 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") 24 # Suppressed warnings: 25 # C4250: 'class1' : inherits 'class2::member' via dominance 26 # C4355: 'this' : used in base member initializer list 27 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 28 # C4996: 'function': was declared deprecated 29 ENDIF(MSVC) 16 30 17 31 ADD_DEFINITIONS(-DHAVE_CONFIG_H) … … 23 37 24 38 ADD_SUBDIRECTORY(lemon) 25 ADD_SUBDIRECTORY(demo) 26 ADD_SUBDIRECTORY(doc) 27 ADD_SUBDIRECTORY(test) 39 IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) 40 ADD_SUBDIRECTORY(demo) 41 ADD_SUBDIRECTORY(tools) 42 ADD_SUBDIRECTORY(doc) 43 ADD_SUBDIRECTORY(test) 44 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) 28 45 29 IF(WIN32) 30 SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) 31 SET(CPACK_PACKAGE_VENDOR "EGRES") 32 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY 33 "LEMON - Library of Efficient Models and Optimization in Networks") 34 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") 46 IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) 47 IF(WIN32) 48 SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) 49 SET(CPACK_PACKAGE_VENDOR "EGRES") 50 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY 51 "LEMON - Library of Efficient Models and Optimization in Networks") 52 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") 35 53 36 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})54 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) 37 55 38 SET(CPACK_PACKAGE_INSTALL_DIRECTORY39 "${PROJECT_NAME} ${PROJECT_VERSION}")40 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY41 "${PROJECT_NAME} ${PROJECT_VERSION}")56 SET(CPACK_PACKAGE_INSTALL_DIRECTORY 57 "${PROJECT_NAME} ${PROJECT_VERSION}") 58 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY 59 "${PROJECT_NAME} ${PROJECT_VERSION}") 42 60 43 SET(CPACK_COMPONENTS_ALL headers library html_documentation)61 SET(CPACK_COMPONENTS_ALL headers library html_documentation bin) 44 62 45 SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") 46 SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") 47 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") 63 SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") 64 SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") 65 SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities") 66 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") 48 67 49 SET(CPACK_COMPONENT_HEADERS_DESCRIPTION 50 "C++ header files") 51 SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION 52 "DLL and import library") 53 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION 54 "Doxygen generated documentation") 68 SET(CPACK_COMPONENT_HEADERS_DESCRIPTION 69 "C++ header files") 70 SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION 71 "DLL and import library") 72 SET(CPACK_COMPONENT_BIN_DESCRIPTION 73 "Command line utilities") 74 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION 75 "Doxygen generated documentation") 55 76 56 SET(CPACK_COMPONENT_HEADERS_DEPENDS library)77 SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 57 78 58 SET(CPACK_COMPONENT_HEADERS_GROUP "Development")59 SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")60 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")79 SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 80 SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 81 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 61 82 62 SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION63 "Components needed to develop software using LEMON")64 SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION65 "Documentation of LEMON")83 SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION 84 "Components needed to develop software using LEMON") 85 SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION 86 "Documentation of LEMON") 66 87 67 SET(CPACK_ALL_INSTALL_TYPES Full Developer)88 SET(CPACK_ALL_INSTALL_TYPES Full Developer) 68 89 69 SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)70 SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)71 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)90 SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) 91 SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) 92 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) 72 93 73 SET(CPACK_GENERATOR "NSIS")74 SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")75 SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")76 #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")77 SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")78 SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")79 SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")80 SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")81 SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")82 SET(CPACK_NSIS_CREATE_ICONS_EXTRA "83 CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"84 ")85 SET(CPACK_NSIS_DELETE_ICONS_EXTRA "86 !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP87 Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"88 ")94 SET(CPACK_GENERATOR "NSIS") 95 SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico") 96 SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico") 97 #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp") 98 SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico") 99 SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}") 100 SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu") 101 SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu") 102 SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") 103 SET(CPACK_NSIS_CREATE_ICONS_EXTRA " 104 CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\" 105 ") 106 SET(CPACK_NSIS_DELETE_ICONS_EXTRA " 107 !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP 108 Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\" 109 ") 89 110 90 INCLUDE(CPack) 91 ENDIF(WIN32) 111 INCLUDE(CPack) 112 ENDIF(WIN32) 113 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) -
CMakeLists.txt
r668 r674 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
r668 r674 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
r667 r674 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
r666 r674 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
r540 r674 19 19 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 20 20 AC_CONFIG_HEADERS([config.h lemon/config.h]) 21 22 lx_cmdline_cxxflags_set=${CXXFLAGS+set}23 21 24 22 dnl Do compilation tests using the C++ compiler. … … 53 51 54 52 dnl Set custom compiler flags when using g++. 55 if test x"$lx_cmdline_cxxflags_set" != x"set" -a"$GXX" = yes -a "$ICC" = no; then56 CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual-Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"53 if test "$GXX" = yes -a "$ICC" = no; then 54 WARNINGCXXFLAGS="-Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas" 57 55 fi 56 AC_SUBST([WARNINGCXXFLAGS]) 58 57 59 58 dnl Checks for libraries. 60 #LX_CHECK_GLPK 61 #LX_CHECK_CPLEX 62 #LX_CHECK_SOPLEX 59 LX_CHECK_GLPK 60 LX_CHECK_CPLEX 61 LX_CHECK_SOPLEX 62 LX_CHECK_COIN 63 63 64 dnl Disable/enable building the demo programs. 65 AC_ARG_ENABLE([demo], 66 AS_HELP_STRING([--enable-demo], [build the demo programs]) 67 AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]), 68 [], [enable_demo=no]) 69 AC_MSG_CHECKING([whether to build the demo programs]) 70 if test x"$enable_demo" != x"no"; then 71 AC_MSG_RESULT([yes]) 72 else 73 AC_MSG_RESULT([no]) 74 fi 75 AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"]) 64 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"]) 65 AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"]) 76 66 77 67 dnl Disable/enable building the binary tools. … … 108 98 AC_CONFIG_FILES([ 109 99 Makefile 100 demo/Makefile 110 101 cmake/version.cmake 111 102 doc/Doxyfile … … 121 112 echo 122 113 echo C++ compiler.................. : $CXX 123 echo C++ compiles flags............ : $ CXXFLAGS114 echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS 124 115 echo 125 116 echo Compiler supports long long... : $long_long_found 126 117 echo 127 #echo GLPK support.................. : $lx_glpk_found 128 #echo CPLEX support................. : $lx_cplex_found 129 #echo SOPLEX support................ : $lx_soplex_found 130 #echo 131 echo Build demo programs........... : $enable_demo 118 echo GLPK support.................. : $lx_glpk_found 119 echo CPLEX support................. : $lx_cplex_found 120 echo SOPLEX support................ : $lx_soplex_found 121 echo CLP support................... : $lx_clp_found 122 echo CBC support................... : $lx_cbc_found 123 echo 132 124 echo Build additional tools........ : $enable_tools 133 125 echo -
configure.ac
r615 r674 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 -
demo/CMakeLists.txt
r539 r674 1 1 INCLUDE_DIRECTORIES( 2 ${ CMAKE_SOURCE_DIR}2 ${PROJECT_SOURCE_DIR} 3 3 ${PROJECT_BINARY_DIR} 4 4 ) 5 5 6 LINK_DIRECTORIES(${ CMAKE_BINARY_DIR}/lemon)6 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) 7 7 8 8 SET(DEMOS -
lemon/CMakeLists.txt
r539 r674 1 1 INCLUDE_DIRECTORIES( 2 ${ CMAKE_SOURCE_DIR}2 ${PROJECT_SOURCE_DIR} 3 3 ${PROJECT_BINARY_DIR} 4 4 ) … … 9 9 ) 10 10 11 ADD_LIBRARY(lemon 11 SET(LEMON_SOURCES 12 12 arg_parser.cc 13 13 base.cc 14 14 color.cc 15 lp_base.cc 16 lp_skeleton.cc 15 17 random.cc 16 18 bits/windows.cc 17 19 ) 20 21 IF(LEMON_HAVE_GLPK) 22 SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc) 23 INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS}) 24 IF(WIN32) 25 INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin) 26 INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin) 27 INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin) 28 ENDIF(WIN32) 29 ENDIF(LEMON_HAVE_GLPK) 30 31 IF(LEMON_HAVE_CPLEX) 32 SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc) 33 INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS}) 34 ENDIF(LEMON_HAVE_CPLEX) 35 36 IF(LEMON_HAVE_CLP) 37 SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc) 38 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 39 ENDIF(LEMON_HAVE_CLP) 40 41 IF(LEMON_HAVE_CBC) 42 SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc) 43 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 44 ENDIF(LEMON_HAVE_CBC) 45 46 ADD_LIBRARY(lemon ${LEMON_SOURCES}) 18 47 19 48 INSTALL( -
lemon/CMakeLists.txt
r668 r674 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
r539 r674 8 8 9 9 lemon_libemon_la_SOURCES = \ 10 lemon/arg_parser.cc \ 11 lemon/base.cc \ 12 lemon/color.cc \ 13 lemon/random.cc \ 10 lemon/arg_parser.cc \ 11 lemon/base.cc \ 12 lemon/color.cc \ 13 lemon/lp_base.cc \ 14 lemon/lp_skeleton.cc \ 15 lemon/random.cc \ 14 16 lemon/bits/windows.cc 15 17 16 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) 17 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 18 19 lemon_libemon_la_CXXFLAGS = \ 20 $(AM_CXXFLAGS) \ 21 $(GLPK_CFLAGS) \ 22 $(CPLEX_CFLAGS) \ 23 $(SOPLEX_CXXFLAGS) \ 24 $(CLP_CXXFLAGS) \ 25 $(CBC_CXXFLAGS) 26 27 lemon_libemon_la_LDFLAGS = \ 28 $(GLPK_LIBS) \ 29 $(CPLEX_LIBS) \ 30 $(SOPLEX_LIBS) \ 31 $(CLP_LIBS) \ 32 $(CBC_LIBS) 33 34 if HAVE_GLPK 35 lemon_libemon_la_SOURCES += lemon/glpk.cc 36 endif 37 38 if HAVE_CPLEX 39 lemon_libemon_la_SOURCES += lemon/cplex.cc 40 endif 41 42 if HAVE_SOPLEX 43 lemon_libemon_la_SOURCES += lemon/soplex.cc 44 endif 45 46 if HAVE_CLP 47 lemon_libemon_la_SOURCES += lemon/clp.cc 48 endif 49 50 if HAVE_CBC 51 lemon_libemon_la_SOURCES += lemon/cbc.cc 52 endif 18 53 19 54 lemon_HEADERS += \ 20 lemon/arg_parser.h \ 55 lemon/adaptors.h \ 56 lemon/arg_parser.h \ 21 57 lemon/assert.h \ 22 lemon/bfs.h \ 23 lemon/bin_heap.h \ 24 lemon/color.h \ 58 lemon/bfs.h \ 59 lemon/bin_heap.h \ 60 lemon/circulation.h \ 61 lemon/clp.h \ 62 lemon/color.h \ 25 63 lemon/concept_check.h \ 26 64 lemon/config.h \ 27 lemon/counter.h \ 65 lemon/connectivity.h \ 66 lemon/counter.h \ 28 67 lemon/core.h \ 29 lemon/dfs.h \ 30 lemon/dijkstra.h \ 31 lemon/dim2.h \ 68 lemon/cplex.h \ 69 lemon/dfs.h \ 70 lemon/dijkstra.h \ 71 lemon/dim2.h \ 72 lemon/dimacs.h \ 73 lemon/edge_set.h \ 74 lemon/elevator.h \ 32 75 lemon/error.h \ 33 lemon/graph_to_eps.h \ 76 lemon/euler.h \ 77 lemon/full_graph.h \ 78 lemon/glpk.h \ 79 lemon/gomory_hu.h \ 80 lemon/graph_to_eps.h \ 81 lemon/grid_graph.h \ 82 lemon/hypercube_graph.h \ 34 83 lemon/kruskal.h \ 84 lemon/hao_orlin.h \ 35 85 lemon/lgf_reader.h \ 36 86 lemon/lgf_writer.h \ 37 87 lemon/list_graph.h \ 88 lemon/lp.h \ 89 lemon/lp_base.h \ 90 lemon/lp_skeleton.h \ 91 lemon/list_graph.h \ 38 92 lemon/maps.h \ 93 lemon/matching.h \ 39 94 lemon/math.h \ 95 lemon/min_cost_arborescence.h \ 96 lemon/nauty_reader.h \ 97 lemon/network_simplex.h \ 40 98 lemon/path.h \ 41 lemon/random.h \ 99 lemon/preflow.h \ 100 lemon/radix_sort.h \ 101 lemon/random.h \ 42 102 lemon/smart_graph.h \ 43 lemon/time_measure.h \ 44 lemon/tolerance.h \ 103 lemon/soplex.h \ 104 lemon/suurballe.h \ 105 lemon/time_measure.h \ 106 lemon/tolerance.h \ 45 107 lemon/unionfind.h \ 46 108 lemon/bits/windows.h … … 50 112 lemon/bits/array_map.h \ 51 113 lemon/bits/base_extender.h \ 52 114 lemon/bits/bezier.h \ 53 115 lemon/bits/default_map.h \ 54 lemon/bits/enable_if.h \ 116 lemon/bits/edge_set_extender.h \ 117 lemon/bits/enable_if.h \ 118 lemon/bits/graph_adaptor_extender.h \ 55 119 lemon/bits/graph_extender.h \ 56 120 lemon/bits/map_extender.h \ 57 121 lemon/bits/path_dump.h \ 122 lemon/bits/solver_bits.h \ 58 123 lemon/bits/traits.h \ 124 lemon/bits/variant.h \ 59 125 lemon/bits/vector_map.h 60 126 -
lemon/Makefile.am
r658 r674 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
r540 r674 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-200 85 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 154 154 class DefaultMap 155 155 : public DefaultMapSelector<_Graph, _Item, _Value>::Map { 156 typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent; 157 156 158 public: 157 typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;158 159 typedef DefaultMap<_Graph, _Item, _Value> Map; 159 160 typedef typename Parent::Graph Graph;160 161 typedef typename Parent::GraphType GraphType; 161 162 typedef typename Parent::Value Value; 162 163 163 explicit DefaultMap(const Graph & graph) : Parent(graph) {}164 DefaultMap(const Graph & graph, const Value& value)164 explicit DefaultMap(const GraphType& graph) : Parent(graph) {} 165 DefaultMap(const GraphType& graph, const Value& value) 165 166 : Parent(graph, value) {} 166 167 -
lemon/bits/default_map.h
r664 r674 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
r540 r674 1 1 #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.cmake
r668 r674 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
r540 r674 1 /* Define to 1 if you have long long */ 2 #undef LEMON_HAVE_LONG_LONG 3 4 /* Define to 1 if you have any LP solver. */ 5 #undef LEMON_HAVE_LP 6 7 /* Define to 1 if you have any MIP solver. */ 8 #undef LEMON_HAVE_MIP 9 1 10 /* Define to 1 if you have CPLEX. */ 2 11 #undef LEMON_HAVE_CPLEX … … 5 14 #undef LEMON_HAVE_GLPK 6 15 7 /* Define to 1 if you have long long */ 8 #undef LEMON_HAVE_LONG_LONG 16 /* Define to 1 if you have SOPLEX */ 17 #undef LEMON_HAVE_SOPLEX 18 19 /* Define to 1 if you have CLP */ 20 #undef LEMON_HAVE_CLP 21 22 /* Define to 1 if you have CBC */ 23 #undef LEMON_HAVE_CBC -
lemon/config.h.in
r614 r674 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
r485 r674 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
r615 r674 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
r540 r674 63 63 if test x"$lx_cplex_found" = x"yes"; then 64 64 AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) 65 lx_lp_found=yes 66 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 67 lx_mip_found=yes 68 AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) 65 69 AC_MSG_RESULT([yes]) 66 70 else -
m4/lx_check_cplex.m4
r480 r674 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
r540 r674 43 43 } 44 44 45 #if (GLP_MAJOR_VERSION < 4) \ 46 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION < 33) 47 #error Supported GLPK versions: 4.33 or above 48 #endif 49 45 50 int main(int argc, char** argv) 46 51 { … … 61 66 if test x"$lx_glpk_found" = x"yes"; then 62 67 AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) 68 lx_lp_found=yes 69 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 70 lx_mip_found=yes 71 AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) 63 72 AC_MSG_RESULT([yes]) 64 73 else -
m4/lx_check_glpk.m4
r482 r674 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
r540 r674 21 21 SOPLEX_CXXFLAGS="-I$with_soplex_includedir" 22 22 elif test x"$with_soplex" != x"yes"; then 23 SOPLEX_CXXFLAGS="-I$with_soplex/ include"23 SOPLEX_CXXFLAGS="-I$with_soplex/src" 24 24 fi 25 25 … … 39 39 40 40 lx_soplex_test_prog=' 41 #include <soplex /soplex.h>41 #include <soplex.h> 42 42 43 43 int main(int argc, char** argv) … … 57 57 if test x"$lx_soplex_found" = x"yes"; then 58 58 AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) 59 lx_lp_found=yes 60 AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) 59 61 AC_MSG_RESULT([yes]) 60 62 else -
m4/lx_check_soplex.m4
r586 r674 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
r539 r674 1 1 INCLUDE_DIRECTORIES( 2 ${ CMAKE_SOURCE_DIR}2 ${PROJECT_SOURCE_DIR} 3 3 ${PROJECT_BINARY_DIR} 4 4 ) 5 5 6 LINK_DIRECTORIES(${ CMAKE_BINARY_DIR}/lemon)6 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) 7 7 8 8 SET(TESTS 9 adaptors_test 9 10 bfs_test 11 circulation_test 10 12 counter_test 11 13 dfs_test … … 13 15 dijkstra_test 14 16 dim_test 17 edge_set_test 15 18 error_test 19 euler_test 20 gomory_hu_test 16 21 graph_copy_test 17 22 graph_test 18 23 graph_utils_test 24 hao_orlin_test 19 25 heap_test 20 26 kruskal_test 21 27 maps_test 28 matching_test 29 min_cost_arborescence_test 30 min_cost_flow_test 31 path_test 32 preflow_test 33 radix_sort_test 22 34 random_test 23 path_test35 suurballe_test 24 36 time_measure_test 25 37 unionfind_test) 38 39 IF(LEMON_HAVE_LP) 40 ADD_EXECUTABLE(lp_test lp_test.cc) 41 SET(LP_TEST_LIBS lemon) 42 IF(LEMON_HAVE_GLPK) 43 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) 44 ENDIF(LEMON_HAVE_GLPK) 45 IF(LEMON_HAVE_CPLEX) 46 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) 47 ENDIF(LEMON_HAVE_CPLEX) 48 IF(LEMON_HAVE_CLP) 49 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) 50 ENDIF(LEMON_HAVE_CLP) 51 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) 52 ADD_TEST(lp_test lp_test) 53 54 IF(WIN32 AND LEMON_HAVE_GLPK) 55 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 56 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 57 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 58 COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH} 59 COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} 60 COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 61 ) 62 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 63 IF(WIN32 AND LEMON_HAVE_CPLEX) 64 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 65 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 66 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 67 COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 68 ) 69 ENDIF(WIN32 AND LEMON_HAVE_CPLEX) 70 ENDIF(LEMON_HAVE_LP) 71 72 IF(LEMON_HAVE_MIP) 73 ADD_EXECUTABLE(mip_test mip_test.cc) 74 SET(MIP_TEST_LIBS lemon) 75 IF(LEMON_HAVE_GLPK) 76 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) 77 ENDIF(LEMON_HAVE_GLPK) 78 IF(LEMON_HAVE_CPLEX) 79 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) 80 ENDIF(LEMON_HAVE_CPLEX) 81 IF(LEMON_HAVE_CBC) 82 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) 83 ENDIF(LEMON_HAVE_CBC) 84 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) 85 ADD_TEST(mip_test mip_test) 86 87 IF(WIN32 AND LEMON_HAVE_GLPK) 88 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 89 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 90 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 91 COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH} 92 COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} 93 COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 94 ) 95 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 96 IF(WIN32 AND LEMON_HAVE_CPLEX) 97 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 98 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 99 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 100 COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 101 ) 102 ENDIF(WIN32 AND LEMON_HAVE_CPLEX) 103 ENDIF(LEMON_HAVE_MIP) 26 104 27 105 FOREACH(TEST_NAME ${TESTS}) -
test/CMakeLists.txt
r668 r674 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
r622 r674 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
r622 r674 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
r661 r674 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.