Changeset 774:4297098d9677 in lemon-0.x for src/work/marci/bfs_dfs.h

Timestamp:

08/30/04 14:01:47 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Merge back the whole branches/hugo++ to trunk.

File:

• src/work/marci/bfs_dfs.h (modified) (7 diffs)

src/work/marci/bfs_dfs.h

@@ -61 +61 @@
         bfs_queue.push(s);
         graph->first(actual_edge, s);
-        if (graph->valid(actual_edge)) { 
-          Node w=graph->bNode(actual_edge);
+        if (actual_edge!=INVALID) { 
+          Node w=graph->head(actual_edge);
           if (!reached[w]) {
             bfs_queue.push(w);
@@ -79 +79 @@
     BfsIterator<Graph, /*OutEdgeIt,*/ ReachedMap>& 
     operator++() { 
-      if (graph->valid(actual_edge)) { 
-        graph->next(actual_edge);
-        if (graph->valid(actual_edge)) {
-          Node w=graph->bNode(actual_edge);
+      if (actual_edge!=INVALID) { 
+        ++actual_edge;
+        if (actual_edge!=INVALID) {
+          Node w=graph->head(actual_edge);
           if (!reached[w]) {
             bfs_queue.push(w);
@@ -95 +95 @@
         if (!bfs_queue.empty()) {
           graph->first(actual_edge, bfs_queue.front());
-          if (graph->valid(actual_edge)) {
-            Node w=graph->bNode(actual_edge);
+          if (actual_edge!=INVALID) {
+            Node w=graph->head(actual_edge);
             if (!reached[w]) {
               bfs_queue.push(w);
@@ -118 +118 @@
     bool isBNodeNewlyReached() const { return b_node_newly_reached; }
     /// Returns if a-node is examined.
-    bool isANodeExamined() const { return !(graph->valid(actual_edge)); }
+    bool isANodeExamined() const { return actual_edge==INVALID; }
     /// Returns a-node of the actual edge, so does if the edge is invalid.
     Node aNode() const { return bfs_queue.front(); }
@@ -238 +238 @@
       actual_edge=dfs_stack.top();
       //actual_node=G.aNode(actual_edge);
-      if (graph->valid(actual_edge)/*.valid()*/) { 
-        Node w=graph->bNode(actual_edge);
+      if (actual_edge!=INVALID/*.valid()*/) { 
+        Node w=graph->head(actual_edge);
         actual_node=w;
         if (!reached[w]) {
@@ -248 +248 @@
           b_node_newly_reached=true;
         } else {
-          actual_node=graph->aNode(actual_edge);
-          graph->next(dfs_stack.top());
+          actual_node=graph->tail(actual_edge);
+          ++dfs_stack.top();
           b_node_newly_reached=false;
         }
@@ -267 +267 @@
     bool isBNodeNewlyReached() const { return b_node_newly_reached; }
     /// Returns if a-node is examined.
-    bool isANodeExamined() const { return !(graph->valid(actual_edge)); }
+    bool isANodeExamined() const { return actual_edge==INVALID; }
     /// Returns a-node of the actual edge, so does if the edge is invalid.
     Node aNode() const { return actual_node; /*FIXME*/}