Changes in / [1064:40bbb450143e:1054:632a72b27123] in lemon
- Files:
-
- 3 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
cmake/FindCOIN.cmake
r1063 r681 6 6 FIND_LIBRARY(COIN_CBC_LIBRARY 7 7 NAMES Cbc libCbc 8 HINTS ${COIN_ROOT_DIR}/lib/coin9 8 HINTS ${COIN_ROOT_DIR}/lib 10 9 ) 11 10 FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY 12 11 NAMES CbcSolver libCbcSolver 13 HINTS ${COIN_ROOT_DIR}/lib/coin14 12 HINTS ${COIN_ROOT_DIR}/lib 15 13 ) 16 14 FIND_LIBRARY(COIN_CGL_LIBRARY 17 15 NAMES Cgl libCgl 18 HINTS ${COIN_ROOT_DIR}/lib/coin19 16 HINTS ${COIN_ROOT_DIR}/lib 20 17 ) 21 18 FIND_LIBRARY(COIN_CLP_LIBRARY 22 19 NAMES Clp libClp 23 HINTS ${COIN_ROOT_DIR}/lib/coin24 20 HINTS ${COIN_ROOT_DIR}/lib 25 21 ) 26 22 FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY 27 23 NAMES CoinUtils libCoinUtils 28 HINTS ${COIN_ROOT_DIR}/lib/coin29 24 HINTS ${COIN_ROOT_DIR}/lib 30 25 ) 31 26 FIND_LIBRARY(COIN_OSI_LIBRARY 32 27 NAMES Osi libOsi 33 HINTS ${COIN_ROOT_DIR}/lib/coin34 28 HINTS ${COIN_ROOT_DIR}/lib 35 29 ) 36 30 FIND_LIBRARY(COIN_OSI_CBC_LIBRARY 37 31 NAMES OsiCbc libOsiCbc 38 HINTS ${COIN_ROOT_DIR}/lib/coin39 32 HINTS ${COIN_ROOT_DIR}/lib 40 33 ) 41 34 FIND_LIBRARY(COIN_OSI_CLP_LIBRARY 42 35 NAMES OsiClp libOsiClp 43 HINTS ${COIN_ROOT_DIR}/lib/coin44 36 HINTS ${COIN_ROOT_DIR}/lib 45 37 ) 46 38 FIND_LIBRARY(COIN_OSI_VOL_LIBRARY 47 39 NAMES OsiVol libOsiVol 48 HINTS ${COIN_ROOT_DIR}/lib/coin49 40 HINTS ${COIN_ROOT_DIR}/lib 50 41 ) 51 42 FIND_LIBRARY(COIN_VOL_LIBRARY 52 43 NAMES Vol libVol 53 HINTS ${COIN_ROOT_DIR}/lib/coin54 44 HINTS ${COIN_ROOT_DIR}/lib 55 45 ) … … 66 56 COIN_OSI_CBC_LIBRARY 67 57 COIN_OSI_CLP_LIBRARY 68 #COIN_OSI_VOL_LIBRARY69 #COIN_VOL_LIBRARY58 COIN_OSI_VOL_LIBRARY 59 COIN_VOL_LIBRARY 70 60 ) 71 61 72 62 IF(COIN_FOUND) 73 63 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) 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} ")64 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};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}") 75 65 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}") 76 66 SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES}) -
lemon/Makefile.am
r1064 r913 60 60 lemon/bfs.h \ 61 61 lemon/bin_heap.h \ 62 lemon/bucket_heap.h \63 62 lemon/cbc.h \ 64 63 lemon/circulation.h \ … … 78 77 lemon/error.h \ 79 78 lemon/euler.h \ 80 lemon/fib_heap.h \81 79 lemon/full_graph.h \ 82 80 lemon/glpk.h \ … … 101 99 lemon/path.h \ 102 100 lemon/preflow.h \ 103 lemon/radix_heap.h \104 101 lemon/radix_sort.h \ 105 102 lemon/random.h \ -
lemon/bin_heap.h
r1064 r912 34 34 ///\brief A Binary Heap implementation. 35 35 /// 36 ///This class implements the \e binary \e heap data structure. 37 /// 36 ///This class implements the \e binary \e heap data structure. 37 /// 38 38 ///A \e heap is a data structure for storing items with specified values 39 39 ///called \e priorities in such a way that finding the item with minimum 40 ///priority is efficient. \c C MPspecifies the ordering of the priorities.40 ///priority is efficient. \c Comp specifies the ordering of the priorities. 41 41 ///In a heap one can change the priority of an item, add or erase an 42 42 ///item, etc. … … 45 45 ///\tparam IM A read and writable item map with int values, used internally 46 46 ///to handle the cross references. 47 ///\tparam C MPA functor class for the ordering of the priorities.47 ///\tparam Comp A functor class for the ordering of the priorities. 48 48 ///The default is \c std::less<PR>. 49 49 /// 50 50 ///\sa FibHeap 51 51 ///\sa Dijkstra 52 template <typename PR, typename IM, typename C MP= std::less<PR> >52 template <typename PR, typename IM, typename Comp = std::less<PR> > 53 53 class BinHeap { 54 54 … … 63 63 typedef std::pair<Item,Prio> Pair; 64 64 ///\e 65 typedef C MPCompare;65 typedef Comp Compare; 66 66 67 67 /// \brief Type to represent the items states. -
lemon/bits/map_extender.h
r1064 r913 50 50 typedef typename Parent::ConstReference ConstReference; 51 51 52 typedef typename Parent::ReferenceMapTag ReferenceMapTag;53 54 52 class MapIt; 55 53 class ConstMapIt; … … 194 192 typedef typename Parent::ConstReference ConstReference; 195 193 196 typedef typename Parent::ReferenceMapTag ReferenceMapTag;197 198 194 class MapIt; 199 195 class ConstMapIt; -
lemon/concepts/maps.h
r1064 r912 183 183 template<typename _ReferenceMap> 184 184 struct Constraints { 185 typename enable_if<typename _ReferenceMap::ReferenceMapTag, void>::type 186 constraints() { 185 void constraints() { 187 186 checkConcept<ReadWriteMap<K, T>, _ReferenceMap >(); 188 187 ref = m[key]; -
test/CMakeLists.txt
r1061 r1044 66 66 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) 67 67 ADD_TEST(lp_test lp_test) 68 ADD_DEPENDENCIES(check lp_test)69 68 70 69 IF(WIN32 AND LEMON_HAVE_GLPK) … … 108 107 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) 109 108 ADD_TEST(mip_test mip_test) 110 ADD_DEPENDENCIES(check mip_test)111 109 112 110 IF(WIN32 AND LEMON_HAVE_GLPK) -
test/heap_test.cc
r1064 r912 32 32 33 33 #include <lemon/bin_heap.h> 34 #include <lemon/fib_heap.h>35 #include <lemon/radix_heap.h>36 #include <lemon/bucket_heap.h>37 34 38 35 #include "test_tools.h" … … 187 184 } 188 185 189 {190 typedef FibHeap<Prio, ItemIntMap> IntHeap;191 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();192 heapSortTest<IntHeap>();193 heapIncreaseTest<IntHeap>();194 195 typedef FibHeap<Prio, IntNodeMap > NodeHeap;196 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();197 dijkstraHeapTest<NodeHeap>(digraph, length, source);198 }199 200 {201 typedef RadixHeap<ItemIntMap> IntHeap;202 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();203 heapSortTest<IntHeap>();204 heapIncreaseTest<IntHeap>();205 206 typedef RadixHeap<IntNodeMap > NodeHeap;207 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();208 dijkstraHeapTest<NodeHeap>(digraph, length, source);209 }210 211 {212 typedef BucketHeap<ItemIntMap> IntHeap;213 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();214 heapSortTest<IntHeap>();215 heapIncreaseTest<IntHeap>();216 217 typedef BucketHeap<IntNodeMap > NodeHeap;218 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();219 dijkstraHeapTest<NodeHeap>(digraph, length, source);220 }221 222 223 186 return 0; 224 187 }
Note: See TracChangeset
for help on using the changeset viewer.