Changeset 2381:0248790c66ea in lemon-0.x for lemon/ugraph_adaptor.h

Timestamp:

03/01/07 17:47:23 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix

File:

• lemon/ugraph_adaptor.h (modified) (4 diffs)

lemon/ugraph_adaptor.h

@@ -152 +152 @@
     typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 
-    NodeNotifier& getNotifier(Node) const {
-      return graph->getNotifier(Node());
+    NodeNotifier& notifier(Node) const {
+      return graph->notifier(Node());
     } 
 
     typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 
-    EdgeNotifier& getNotifier(Edge) const {
-      return graph->getNotifier(Edge());
+    EdgeNotifier& notifier(Edge) const {
+      return graph->notifier(Edge());
     } 
 
     typedef typename ItemSetTraits<Graph, UEdge>::ItemNotifier UEdgeNotifier;
 
-    UEdgeNotifier& getNotifier(UEdge) const {
-      return graph->getNotifier(UEdge());
+    UEdgeNotifier& notifier(UEdge) const {
+      return graph->notifier(UEdge());
     } 
 
@@ -312 +312 @@
       Parent::firstInc(i, d, n); 
       while (i!=INVALID && (!(*uedge_filter_map)[i] 
+            || !(*node_filter_map)[Parent::source(i)]
             || !(*node_filter_map)[Parent::target(i)])) Parent::nextInc(i, d); 
     }
@@ -348 +349 @@
     void nextInc(UEdge& i, bool& d) const { 
       Parent::nextInc(i, d); 
-      while (i!=INVALID && (!(*uedge_filter_map)[i] 
-            || !(*node_filter_map)[Parent::source(i)])) Parent::nextInc(i, d); 
+      while (i!=INVALID && (!(*uedge_filter_map)[i]
+            || !(*node_filter_map)[Parent::source(i)]
+            || !(*node_filter_map)[Parent::target(i)])) Parent::nextInc(i, d); 
     }
 
@@ -988 +990 @@
     typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 
-    NodeNotifier& getNotifier(Node) const {
-      return graph->getNotifier(Node());
+    NodeNotifier& notifier(Node) const {
+      return graph->notifier(Node());
     } 
 
     typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 
-    EdgeNotifier& getNotifier(Edge) const {
-      return graph->getNotifier(Edge());
+    EdgeNotifier& notifier(Edge) const {
+      return graph->notifier(Edge());
     }