Changeset 912:37f440367057 in lemon

Timestamp:

02/26/10 17:07:13 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Phase:

public

Message:

Back out 4 changesets (#50, #312)

• 532697c9fa53
• bb8c4cd57900
• 9f529abcaebf
• 703ebf476a1d

Files:

• lemon/Makefile.am (modified) (3 diffs)
• lemon/bin_heap.h (modified) (3 diffs)
• lemon/bits/map_extender.h (modified) (2 diffs)
• lemon/bucket_heap.h (deleted)
• lemon/concepts/maps.h (modified) (1 diff)
• lemon/fib_heap.h (deleted)
• lemon/radix_heap.h (deleted)
• test/heap_test.cc (modified) (2 diffs)

lemon/Makefile.am

@@ -60 +60 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
-        lemon/bucket_heap.h \
         lemon/cbc.h \
         lemon/circulation.h \
@@ -78 +77 @@
         lemon/error.h \
         lemon/euler.h \
-        lemon/fib_heap.h \
         lemon/full_graph.h \
         lemon/glpk.h \
@@ -102 +100 @@
         lemon/path.h \
         lemon/preflow.h \
-        lemon/radix_heap.h \
         lemon/radix_sort.h \
         lemon/random.h \

lemon/bin_heap.h

@@ -34 +34 @@
   ///\brief A Binary Heap implementation.
   ///
-  ///This class implements the \e binary \e heap data structure.
-  ///
+  ///This class implements the \e binary \e heap data structure. 
+  /// 
   ///A \e heap is a data structure for storing items with specified values
   ///called \e priorities in such a way that finding the item with minimum
-  ///priority is efficient. \c CMP specifies the ordering of the priorities.
+  ///priority is efficient. \c Comp specifies the ordering of the priorities.
   ///In a heap one can change the priority of an item, add or erase an
   ///item, etc.
@@ -45 +45 @@
   ///\tparam IM A read and writable item map with int values, used internally
   ///to handle the cross references.
-  ///\tparam CMP A functor class for the ordering of the priorities.
+  ///\tparam Comp A functor class for the ordering of the priorities.
   ///The default is \c std::less<PR>.
   ///
   ///\sa FibHeap
   ///\sa Dijkstra
-  template <typename PR, typename IM, typename CMP = std::less<PR> >
+  template <typename PR, typename IM, typename Comp = std::less<PR> >
   class BinHeap {
 
@@ -63 +63 @@
     typedef std::pair<Item,Prio> Pair;
     ///\e
-    typedef CMP Compare;
+    typedef Comp Compare;
 
     /// \brief Type to represent the items states.

lemon/bits/map_extender.h

@@ -50 +50 @@
     typedef typename Parent::ConstReference ConstReference;
 
-    typedef typename Parent::ReferenceMapTag ReferenceMapTag;
-
     class MapIt;
     class ConstMapIt;
@@ -194 +192 @@
     typedef typename Parent::ConstReference ConstReference;
 
-    typedef typename Parent::ReferenceMapTag ReferenceMapTag;
-
     class MapIt;
     class ConstMapIt;

lemon/concepts/maps.h

@@ -183 +183 @@
       template<typename _ReferenceMap>
       struct Constraints {
-        typename enable_if<typename _ReferenceMap::ReferenceMapTag, void>::type
-        constraints() {
+        void constraints() {
           checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
           ref = m[key];

test/heap_test.cc

@@ -32 +32 @@
 
 #include <lemon/bin_heap.h>
-#include <lemon/fib_heap.h>
-#include <lemon/radix_heap.h>
-#include <lemon/bucket_heap.h>
 
 #include "test_tools.h"
@@ -187 +184 @@
   }
 
-  {
-    typedef FibHeap<Prio, ItemIntMap> IntHeap;
-    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>();
-    heapIncreaseTest<IntHeap>();
-
-    typedef FibHeap<Prio, IntNodeMap > NodeHeap;
-    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
-    dijkstraHeapTest<NodeHeap>(digraph, length, source);
-  }
-
-  {
-    typedef RadixHeap<ItemIntMap> IntHeap;
-    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>();
-    heapIncreaseTest<IntHeap>();
-
-    typedef RadixHeap<IntNodeMap > NodeHeap;
-    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
-    dijkstraHeapTest<NodeHeap>(digraph, length, source);
-  }
-
-  {
-    typedef BucketHeap<ItemIntMap> IntHeap;
-    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>();
-    heapIncreaseTest<IntHeap>();
-
-    typedef BucketHeap<IntNodeMap > NodeHeap;
-    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
-    dijkstraHeapTest<NodeHeap>(digraph, length, source);
-  }
-
-
   return 0;
 }