Changeset 2263:9273fe7d850c in lemon-0.x for lemon/bucket_heap.h

Timestamp:

10/26/06 16:20:17 (18 years ago)

Author:

mqrelly

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3021

Message:

Bug #46 fixed: Superfluous template parameter in Heap concept
NOTE: Not every affected file tested.

File:

• lemon/bucket_heap.h (modified) (5 diffs)

lemon/bucket_heap.h

@@ -42 +42 @@
   /// the priorities are small. It is not intended to use as dijkstra heap.
   ///
-  /// \param _Item Type of the items to be stored.  
   /// \param _ItemIntMap A read and writable Item int map, used internally
   /// to handle the cross references.
   /// \param minimize If the given parameter is true then the heap gives back
   /// the lowest priority. 
-  template <typename _Item, typename _ItemIntMap, bool minimize = true >
+  template <typename _ItemIntMap, bool minimize = true >
   class BucketHeap {
 
   public:
-    typedef _Item Item;
+    typedef typename _ItemIntMap::Key Item;
     typedef int Prio;
     typedef std::pair<Item, Prio> Pair;
@@ -327 +326 @@
 
 
-  template <typename _Item, typename _ItemIntMap>
-  class BucketHeap<_Item, _ItemIntMap, false> {
-
-  public:
-    typedef _Item Item;
+  template <typename _ItemIntMap>
+  class BucketHeap<_ItemIntMap, false> {
+
+  public:
+    typedef typename _ItemIntMap::Key Item;
     typedef int Prio;
     typedef std::pair<Item, Prio> Pair;
@@ -525 +524 @@
   /// minimal and it does not supports key increasing, decreasing.
   ///
-  /// \param _Item Type of the items to be stored.  
   /// \param _ItemIntMap A read and writable Item int map, used internally
   /// to handle the cross references.
@@ -532 +530 @@
   ///
   /// \sa BucketHeap 
-  template <typename _Item, typename _ItemIntMap, bool minimize = true >
+  template <typename _ItemIntMap, bool minimize = true >
   class SimpleBucketHeap {
 
   public:
-    typedef _Item Item;
+    typedef typename _ItemIntMap::Key Item;
     typedef int Prio;
     typedef std::pair<Item, Prio> Pair;
@@ -710 +708 @@
   }; // class SimpleBucketHeap
 
-  template <typename _Item, typename _ItemIntMap>
-  class SimpleBucketHeap<_Item, _ItemIntMap, false> {
-
-  public:
-    typedef _Item Item;
+  template <typename _ItemIntMap>
+  class SimpleBucketHeap<_ItemIntMap, false> {
+
+  public:
+    typedef typename _ItemIntMap::Key Item;
     typedef int Prio;
     typedef std::pair<Item, Prio> Pair;