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

src/lemon/full_graph.h

@@ -79 +79 @@
     int maxId(Edge = INVALID) const { return EdgeNum-1; }
 
-    Node tail(Edge e) const { return e.id % NodeNum; }
-    Node head(Edge e) const { return e.id / NodeNum; }
+    Node source(Edge e) const { return e.id % NodeNum; }
+    Node target(Edge e) const { return e.id / NodeNum; }
 
 
@@ -137 +137 @@
       
     protected:
-      int id;  // NodeNum * head + tail;
+      int id;  // NodeNum * target + source;
 
       Edge(int _id) : id(_id) {}
 
-      Edge(const FullGraphBase& _graph, int tail, int head) 
-        : id(_graph.NodeNum * head+tail) {}
+      Edge(const FullGraphBase& _graph, int source, int target) 
+        : id(_graph.NodeNum * target+source) {}
     public:
       Edge() { }
@@ -251 +251 @@
     int maxId(Edge = INVALID) const { return EdgeNum-1; }
 
-    Node tail(Edge e) const { 
+    Node source(Edge e) const { 
       /// \todo we may do it faster
       return ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2; 
     }
 
-    Node head(Edge e) const { 
-      int tail = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
-      return e.id - (tail) * (tail - 1) / 2; 
+    Node target(Edge e) const { 
+      int source = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
+      return e.id - (source) * (source - 1) / 2; 
     }
 
@@ -316 +316 @@
       
     protected:
-      int id;  // NodeNum * head + tail;
+      int id;  // NodeNum * target + source;
 
       Edge(int _id) : id(_id) {}
 
-      Edge(const UndirFullGraphBase& _graph, int tail, int head) 
-        : id(_graph.NodeNum * head+tail) {}
+      Edge(const UndirFullGraphBase& _graph, int source, int target) 
+        : id(_graph.NodeNum * target+source) {}
     public:
       Edge() { }
@@ -352 +352 @@
     /// \todo with specialized iterators we can make faster iterating
     void nextOut(Edge& e) const {
-      int tail = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
-      int head = e.id - (tail) * (tail - 1) / 2; 
-      ++head;
-      e.id = head < tail ? tail * (tail - 1) / 2 + head : -1;
+      int source = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
+      int target = e.id - (source) * (source - 1) / 2; 
+      ++target;
+      e.id = target < source ? source * (source - 1) / 2 + target : -1;
     }
 
@@ -363 +363 @@
     
     void nextIn(Edge& e) const {
-      int tail = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
-      int head = e.id - (tail) * (tail - 1) / 2; ++head;
-      ++tail;
-      e.id = tail < NodeNum ? tail * (tail - 1) / 2 + head : -1;
+      int source = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
+      int target = e.id - (source) * (source - 1) / 2; ++target;
+      ++source;
+      e.id = source < NodeNum ? source * (source - 1) / 2 + target : -1;
     }