Changeset 986:e997802b855c in lemon-0.x for src/lemon/graph_wrapper.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/lemon/graph_wrapper.h (modified) (11 diffs)

src/lemon/graph_wrapper.h

@@ -151 +151 @@
     void nextOut(Edge& i) const { graph->nextOut(i); }
 
-    Node tail(const Edge& e) const { return graph->tail(e); }
-    Node head(const Edge& e) const { return graph->head(e); }
-//     Node tail(const Edge& e) const { 
-//       return Node(graph->tail(static_cast<typename Graph::Edge>(e))); }
-//     Node head(const Edge& e) const { 
-//       return Node(graph->head(static_cast<typename Graph::Edge>(e))); }
+    Node source(const Edge& e) const { return graph->source(e); }
+    Node target(const Edge& e) const { return graph->target(e); }
+//     Node source(const Edge& e) const { 
+//       return Node(graph->source(static_cast<typename Graph::Edge>(e))); }
+//     Node target(const Edge& e) const { 
+//       return Node(graph->target(static_cast<typename Graph::Edge>(e))); }
 
     int nodeNum() const { return graph->nodeNum(); }
@@ -162 +162 @@
   
     Node addNode() const { return Node(graph->addNode()); }
-    Edge addEdge(const Node& tail, const Node& head) const { 
-      return Edge(graph->addEdge(tail, head)); }
+    Edge addEdge(const Node& source, const Node& target) const { 
+      return Edge(graph->addEdge(source, target)); }
 
     void erase(const Node& i) const { graph->erase(i); }
@@ -291 +291 @@
     }
 
-    Node tail(const Edge& e) const { 
-      return GraphWrapper<Graph>::head(e); }
-    Node head(const Edge& e) const { 
-      return GraphWrapper<Graph>::tail(e); }
+    Node source(const Edge& e) const { 
+      return GraphWrapper<Graph>::target(e); }
+    Node target(const Edge& e) const { 
+      return GraphWrapper<Graph>::source(e); }
 
     //    KEEP_MAPS(Parent, RevGraphWrapper);
@@ -626 +626 @@
   readDimacs(std::cin, g, length, s, t);
 
-  cout << "edges with lengths (of form id, tail--length->head): " << endl;
+  cout << "edges with lengths (of form id, source--length->target): " << endl;
   for(EdgeIt e(g); e!=INVALID; ++e) 
-    cout << g.id(e) << ", " << g.id(g.tail(e)) << "--" 
-         << length[e] << "->" << g.id(g.head(e)) << endl;
+    cout << g.id(e) << ", " << g.id(g.source(e)) << "--" 
+         << length[e] << "->" << g.id(g.target(e)) << endl;
 
   cout << "s: " << g.id(s) << " t: " << g.id(t) << endl;
@@ -666 +666 @@
   for(EdgeIt e(g); e!=INVALID; ++e) 
     if (flow[e])
-      cout << " " << g.id(g.tail(e)) << "--" 
-           << length[e] << "->" << g.id(g.head(e)) << endl;
+      cout << " " << g.id(g.source(e)) << "--" 
+           << length[e] << "->" << g.id(g.target(e)) << endl;
   \endcode
   The program has the following (expected :-)) output:
   \code
-  edges with lengths (of form id, tail--length->head):
+  edges with lengths (of form id, source--length->target):
    9, 5--4->6
    8, 4--2->6
@@ -757 +757 @@
     OutEdgeIt& next(OutEdgeIt& e) const {
       if (e.out_or_in) {
-        typename Graph::Node n=this->graph->tail(e.out);
+        typename Graph::Node n=this->graph->source(e.out);
         this->graph->next(e.out);
         if (!this->graph->valid(e.out)) { 
@@ -768 +768 @@
 
     Node aNode(const OutEdgeIt& e) const { 
-      if (e.out_or_in) return this->graph->tail(e); else 
-        return this->graph->head(e); }
+      if (e.out_or_in) return this->graph->source(e); else 
+        return this->graph->target(e); }
     Node bNode(const OutEdgeIt& e) const { 
-      if (e.out_or_in) return this->graph->head(e); else 
-        return this->graph->tail(e); }
+      if (e.out_or_in) return this->graph->target(e); else 
+        return this->graph->source(e); }
 
     //    KEEP_MAPS(Parent, UndirGraphWrapper);
@@ -938 +938 @@
       OutEdgeIt& operator++() { 
         if (!this->backward) {
-          Node n=gw->tail(*this);
+          Node n=gw->source(*this);
           *(static_cast<GraphEdge*>(this))=
             ++(typename Graph::OutEdgeIt(*(gw->graph), *this));
@@ -995 +995 @@
       InEdgeIt& operator++() { 
         if (!this->backward) {
-          Node n=gw->tail(*this);
+          Node n=gw->source(*this);
           *(static_cast<GraphEdge*>(this))=
             ++(typename Graph::InEdgeIt(*(gw->graph), *this));
@@ -1090 +1090 @@
   
 
-    Node tail(Edge e) const { 
-      return ((!e.backward) ? this->graph->tail(e) : this->graph->head(e)); }
-    Node head(Edge e) const { 
-      return ((!e.backward) ? this->graph->head(e) : this->graph->tail(e)); }
+    Node source(Edge e) const { 
+      return ((!e.backward) ? this->graph->source(e) : this->graph->target(e)); }
+    Node target(Edge e) const { 
+      return ((!e.backward) ? this->graph->target(e) : this->graph->source(e)); }
 
     /// Gives back the opposite edge.
@@ -1414 +1414 @@
 //     }
     void erase(const Edge& e) const {
-      Node n=tail(e);
+      Node n=source(e);
       typename Graph::OutEdgeIt f(*Parent::graph, n);
       ++f;