Changeset 986:e997802b855c in lemon-0.x for src/work/marci/bfs_mm.h

Timestamp:

11/13/04 13:53:28 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Naming changes:

• head -> target
• tail -> source

File:

• src/work/marci/bfs_mm.h (modified) (9 diffs)

src/work/marci/bfs_mm.h

@@ -72 +72 @@
         //graph->first(actual_edge, s);
         if (actual_edge!=INVALID) { 
-          Node w=graph->head(actual_edge);
+          Node w=graph->target(actual_edge);
           if (!(*reached_map)[w]) {
             bfs_queue.push(w);
@@ -94 +94 @@
         //++actual_edge;
         if (actual_edge!=INVALID) {
-          Node w=graph->head(actual_edge);
+          Node w=graph->target(actual_edge);
           if (!(*reached_map)[w]) {
             bfs_queue.push(w);
@@ -109 +109 @@
           //graph->first(actual_edge, bfs_queue.front());
           if (actual_edge!=INVALID) {
-            Node w=graph->head(actual_edge);
+            Node w=graph->target(actual_edge);
             if (!(*reached_map)[w]) {
               bfs_queue.push(w);
@@ -133 +133 @@
     bool isANodeExamined() const { return actual_edge==INVALID; }
     /// Returns a-node of the actual edge, so does if the edge is invalid.
-    Node tail() const { return bfs_queue.front(); }
+    Node source() const { return bfs_queue.front(); }
     /// \pre The actual edge have to be valid.
-    Node head() const { return graph->head(actual_edge); }
+    Node target() const { return graph->target(actual_edge); }
     /// Guess what?
     /// \deprecated 
@@ -232 +232 @@
       if ((this->actual_edge)!=INVALID && this->b_node_newly_reached) 
       {
-        pred_map->set(this->head(), this->actual_edge);
-        pred_node_map->set(this->head(), this->tail());
-        dist_map->set(this->head(), (*dist_map)[this->tail()]);
+        pred_map->set(this->target(), this->actual_edge);
+        pred_node_map->set(this->target(), this->source());
+        dist_map->set(this->target(), (*dist_map)[this->source()]);
       }
       return *this;
@@ -458 +458 @@
       actual_edge=dfs_stack.top();
       if (actual_edge!=INVALID/*.valid()*/) { 
-        Node w=graph->head(actual_edge);
+        Node w=graph->target(actual_edge);
         actual_node=w;
         if (!reached[w]) {
@@ -467 +467 @@
           b_node_newly_reached=true;
         } else {
-          actual_node=graph->tail(actual_edge);
+          actual_node=graph->source(actual_edge);
           ++dfs_stack.top();
           b_node_newly_reached=false;
@@ -488 +488 @@
     bool isANodeExamined() const { return actual_edge==INVALID; }
     /// Returns a-node of the actual edge, so does if the edge is invalid.
-    Node tail() const { return actual_node; /*FIXME*/}
+    Node source() const { return actual_node; /*FIXME*/}
     /// Returns b-node of the actual edge. 
     /// \pre The actual edge have to be valid.
-    Node head() const { return graph->head(actual_edge); }
+    Node target() const { return graph->target(actual_edge); }
     /// Guess what?
     /// \deprecated
@@ -545 +545 @@
       if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached) 
       {
-        pred.set(this->head(), this->actual_edge);
+        pred.set(this->target(), this->actual_edge);
       }
       return *this;