Changeset 1990:15fb7a4ea6be in lemon-0.x for lemon/edge_set.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/edge_set.h (modified) (5 diffs)

lemon/edge_set.h

@@ -21 +21 @@
 
 
+#include <lemon/bits/default_map.h>
 #include <lemon/bits/edge_set_extender.h>
 
@@ -46 +47 @@
     };
 
-    typedef typename Graph::template NodeMap<NodeT> NodesImplBase;
+    typedef DefaultMap<Graph, Node, NodeT> NodesImplBase;
 
     NodesImplBase* nodes;
@@ -197 +198 @@
     Node target(const Edge& edge) const { return edges[edge.id].target;}
 
+    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+
+    NodeNotifier& getNotifier(Node) const {
+      return graph->getNotifier(Node());
+    } 
+
     template <typename _Value>
     class NodeMap : public Graph::template NodeMap<_Value> {
@@ -405 +412 @@
     };
 
-    typedef typename Graph::template NodeMap<NodeT> NodesImplBase;
+    typedef DefaultMap<Graph, Node, NodeT> NodesImplBase;
 
     NodesImplBase* nodes;
@@ -506 +513 @@
     Node target(const Edge& edge) const { return edges[edge.id].target;}
 
+    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+
+    NodeNotifier& getNotifier(Node) const {
+      return graph->getNotifier(Node());
+    } 
+
     template <typename _Value>
     class NodeMap : public Graph::template NodeMap<_Value> {