Changeset 854:baf0b6e40211 in lemon-0.x for src/hugo

Timestamp:

09/15/04 12:34:12 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

correction of SubGraphWrapper? bug.

File:

• src/hugo/graph_wrapper.h (modified) (4 diffs)

src/hugo/graph_wrapper.h

@@ -379 +379 @@
       NodeIt(Invalid i) : Node(i) { }
       NodeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw) : 
-        Node(typename Graph::NodeIt(*(_gw.graph))), gw(&_gw) { }
+        Node(typename Graph::NodeIt(*(_gw.graph))), gw(&_gw) { 
+        while (*static_cast<Node*>(this)!=INVALID && 
+               !(*(gw->edge_filter_map))[*this]) 
+          *(static_cast<Node*>(this))=
+            ++(typename Graph::NodeIt(*(gw->graph), *this));
+      }
       NodeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, 
              const Node& n) : 
@@ -402 +407 @@
       OutEdgeIt(Invalid i) : Edge(i) { }
       OutEdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, const Node& n) : 
-        Edge(typename Graph::OutEdgeIt(*(_gw.graph), n)), gw(&_gw) { }
+        Edge(typename Graph::OutEdgeIt(*(_gw.graph), n)), gw(&_gw) { 
+        while (*static_cast<Edge*>(this)!=INVALID && 
+               !(*(gw->edge_filter_map))[*this]) 
+          *(static_cast<Edge*>(this))=
+            ++(typename Graph::OutEdgeIt(*(gw->graph), *this));
+      }
       OutEdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, 
              const Edge& e) : 
@@ -424 +434 @@
       InEdgeIt(Invalid i) : Edge(i) { }
       InEdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, const Node& n) : 
-        Edge(typename Graph::InEdgeIt(*(_gw.graph), n)), gw(&_gw) { }
+        Edge(typename Graph::InEdgeIt(*(_gw.graph), n)), gw(&_gw) { 
+        while (*static_cast<Edge*>(this)!=INVALID && 
+               !(*(gw->edge_filter_map))[*this]) 
+          *(static_cast<Edge*>(this))=
+            ++(typename Graph::InEdgeIt(*(gw->graph), *this));
+      }
       InEdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, 
              const Edge& e) : 
@@ -446 +461 @@
       EdgeIt(Invalid i) : Edge(i) { }
       EdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw) : 
-        Edge(typename Graph::EdgeIt(*(_gw.graph))), gw(&_gw) { }
+        Edge(typename Graph::EdgeIt(*(_gw.graph))), gw(&_gw) { 
+        while (*static_cast<Edge*>(this)!=INVALID && 
+               !(*(gw->edge_filter_map))[*this]) 
+          *(static_cast<Edge*>(this))=
+            ++(typename Graph::EdgeIt(*(gw->graph), *this));
+      }
       EdgeIt(const SubGraphWrapper<Graph, NodeFilterMap, EdgeFilterMap>& _gw, 
              const Edge& e) :