COIN-OR::LEMON - Graph Library

Changeset 912:37f440367057 in lemon


Ignore:
Timestamp:
02/26/10 17:07:13 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.1
Message:

Back out 4 changesets (#50, #312)

Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r728 r912  
    6060        lemon/bfs.h \ 
    6161        lemon/bin_heap.h \ 
    62         lemon/bucket_heap.h \ 
    6362        lemon/cbc.h \ 
    6463        lemon/circulation.h \ 
     
    7877        lemon/error.h \ 
    7978        lemon/euler.h \ 
    80         lemon/fib_heap.h \ 
    8179        lemon/full_graph.h \ 
    8280        lemon/glpk.h \ 
     
    102100        lemon/path.h \ 
    103101        lemon/preflow.h \ 
    104         lemon/radix_heap.h \ 
    105102        lemon/radix_sort.h \ 
    106103        lemon/random.h \ 
  • lemon/bin_heap.h

    r730 r912  
    3434  ///\brief A Binary Heap implementation. 
    3535  /// 
    36   ///This class implements the \e binary \e heap data structure. 
    37   /// 
     36  ///This class implements the \e binary \e heap data structure.  
     37  ///  
    3838  ///A \e heap is a data structure for storing items with specified values 
    3939  ///called \e priorities in such a way that finding the item with minimum 
    40   ///priority is efficient. \c CMP specifies the ordering of the priorities. 
     40  ///priority is efficient. \c Comp specifies the ordering of the priorities. 
    4141  ///In a heap one can change the priority of an item, add or erase an 
    4242  ///item, etc. 
     
    4545  ///\tparam IM A read and writable item map with int values, used internally 
    4646  ///to handle the cross references. 
    47   ///\tparam CMP A functor class for the ordering of the priorities. 
     47  ///\tparam Comp A functor class for the ordering of the priorities. 
    4848  ///The default is \c std::less<PR>. 
    4949  /// 
    5050  ///\sa FibHeap 
    5151  ///\sa Dijkstra 
    52   template <typename PR, typename IM, typename CMP = std::less<PR> > 
     52  template <typename PR, typename IM, typename Comp = std::less<PR> > 
    5353  class BinHeap { 
    5454 
     
    6363    typedef std::pair<Item,Prio> Pair; 
    6464    ///\e 
    65     typedef CMP Compare; 
     65    typedef Comp Compare; 
    6666 
    6767    /// \brief Type to represent the items states. 
  • lemon/bits/map_extender.h

    r765 r912  
    5050    typedef typename Parent::ConstReference ConstReference; 
    5151 
    52     typedef typename Parent::ReferenceMapTag ReferenceMapTag; 
    53  
    5452    class MapIt; 
    5553    class ConstMapIt; 
     
    194192    typedef typename Parent::ConstReference ConstReference; 
    195193 
    196     typedef typename Parent::ReferenceMapTag ReferenceMapTag; 
    197  
    198194    class MapIt; 
    199195    class ConstMapIt; 
  • lemon/concepts/maps.h

    r765 r912  
    183183      template<typename _ReferenceMap> 
    184184      struct Constraints { 
    185         typename enable_if<typename _ReferenceMap::ReferenceMapTag, void>::type 
    186         constraints() { 
     185        void constraints() { 
    187186          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >(); 
    188187          ref = m[key]; 
  • test/heap_test.cc

    r728 r912  
    3232 
    3333#include <lemon/bin_heap.h> 
    34 #include <lemon/fib_heap.h> 
    35 #include <lemon/radix_heap.h> 
    36 #include <lemon/bucket_heap.h> 
    3734 
    3835#include "test_tools.h" 
     
    187184  } 
    188185 
    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  
    223186  return 0; 
    224187} 
Note: See TracChangeset for help on using the changeset viewer.