Changeset 1990:15fb7a4ea6be in lemon-0.x for lemon/graph_utils.h

Timestamp:

03/01/06 11:17:25 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some classes assumed that the GraphMaps? should be inherited
from an ObserverBase?. These classes parents replaced with
DefaultMap? which cause that the graph maps should not be
inherited from the ObserverBase?.

File:

• lemon/graph_utils.h (modified) (6 diffs)

lemon/graph_utils.h

@@ -29 +29 @@
 #include <lemon/maps.h>
 #include <lemon/traits.h>
+
 #include <lemon/bits/alteration_notifier.h>
+#include <lemon/bits/default_map.h>
 
 ///\ingroup gutils
@@ -901 +903 @@
   /// \param _Map A ReadWriteMap mapping from the item type to integer.
   template <
-    typename _Graph, typename _Item, typename _Value, typename _Map 
-    = typename ItemSetTraits<_Graph, _Item>::template Map<_Value>::Parent 
+    typename _Graph, typename _Item, typename _Value, 
+    typename _Map = DefaultMap<_Graph, _Item, _Value>
   >
 #else
@@ -1106 +1108 @@
   /// \param _Map A ReadWriteMap mapping from the item type to integer.
   template <
-    typename _Graph, typename _Item, typename _Map 
-    = typename ItemSetTraits<_Graph, _Item>::template Map<int>::Parent 
+    typename _Graph, typename _Item,
+    typename _Map = DefaultMap<_Graph, _Item, int>
   >
 #else
@@ -1506 +1508 @@
   private:
 
-    class AutoNodeMap : public Graph::template NodeMap<int> {
+    class AutoNodeMap : public DefaultMap<_Graph, Key, int> {
     public:
 
-      typedef typename Graph::template NodeMap<int> Parent;
-
-      typedef typename Parent::Key Key;
-      typedef typename Parent::Value Value;
-      
+      typedef DefaultMap<_Graph, Key, int> Parent;
+
       AutoNodeMap(const Graph& graph) : Parent(graph, 0) {}
       
@@ -1623 +1622 @@
   private:
 
-    class AutoNodeMap : public Graph::template NodeMap<int> {
+    class AutoNodeMap : public DefaultMap<_Graph, Key, int> {
     public:
 
-      typedef typename Graph::template NodeMap<int> Parent;
-
-      typedef typename Parent::Key Key;
-      typedef typename Parent::Value Value;
-      
+      typedef DefaultMap<_Graph, Key, int> Parent;
+
       AutoNodeMap(const Graph& graph) : Parent(graph, 0) {}
       
@@ -1664 +1660 @@
     }
     
-    /// Gives back the in-degree of a Node.
+    /// Gives back the out-degree of a Node.
     int operator[](const Key& key) const {
       return deg[key];