Changeset 2308:cddae1c4fee6 in lemon-0.x

Timestamp:

11/24/06 15:24:43 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Erasing unionfind Item template parameter

Files:

• lemon/kruskal.h (modified) (1 diff)
• lemon/max_matching.h (modified) (1 diff)
• lemon/unionfind.h (modified) (4 diffs)
• test/unionfind_test.cc (modified) (1 diff)

lemon/kruskal.h

@@ -119 +119 @@
 
     NodeIntMap comp(g);
-    UnionFind<Node,NodeIntMap> uf(comp);
+    UnionFind<NodeIntMap> uf(comp);
     for (typename GR::NodeIt it(g); it != INVALID; ++it) {
       uf.insert(it);

lemon/max_matching.h

@@ -67 +67 @@
 
     typedef typename Graph::template NodeMap<int> UFECrossRef;
-    typedef UnionFindEnum<Node, UFECrossRef> UFE;
+    typedef UnionFindEnum<UFECrossRef> UFE;
 
   public:

lemon/unionfind.h

@@ -34 +34 @@
 namespace lemon {
 
-  //! \addtogroup auxdat
-  //! @{
-
+  /// \ingroup auxdat
+  ///
   /// \brief A \e Union-Find data structure implementation
   ///
@@ -52 +51 @@
   /// \pre You need to add all the elements by the \ref insert()
   /// method.  
-  template <typename Item, typename ItemIntMap>
+  template <typename _ItemIntMap>
   class UnionFind {
-    
   public:
-    typedef Item ElementType;
+
+    typedef _ItemIntMap ItemIntMap;
+    typedef typename ItemIntMap::Key Item;
 
   private:
@@ -147 +147 @@
   };
 
-
+  /// \ingroup auxdat
+  ///
   /// \brief A \e Union-Find data structure implementation which
   /// is able to enumerate the components.
@@ -162 +163 @@
   /// method.
   ///
-  template <typename _Item, typename _ItemIntMap>
+  template <typename _ItemIntMap>
   class UnionFindEnum {
   public:
     
-    typedef _Item Item;
     typedef _ItemIntMap ItemIntMap;
-    
+    typedef typename ItemIntMap::Key Item;
+
   private:
     

test/unionfind_test.cc

@@ -26 +26 @@
 using namespace std;
 
-typedef UnionFindEnum<int, StdMap<int, int> > UFE;
+typedef UnionFindEnum<StdMap<int, int> > UFE;
 
 void print(UFE const &ufe) {