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

src/lemon/list_graph.h

@@ -44 +44 @@
  
     struct EdgeT {
-      int head, tail;
+      int target, source;
       int prev_in, prev_out;
       int next_in, next_out;
@@ -112 +112 @@
     int maxId(Edge = INVALID) const { return edges.size()-1; }
 
-    Node tail(Edge e) const { return edges[e.id].tail; }
-    Node head(Edge e) const { return edges[e.id].head; }
+    Node source(Edge e) const { return edges[e.id].source; }
+    Node target(Edge e) const { return edges[e.id].target; }
 
 
@@ -138 +138 @@
       } else {
         int n;
-        for(n = nodes[edges[edge.id].head].next;
+        for(n = nodes[edges[edge.id].target].next;
           n!=-1 && nodes[n].first_in == -1; 
           n = nodes[n].next);
@@ -199 +199 @@
       }
       
-      edges[n].tail = u.id; 
-      edges[n].head = v.id;
+      edges[n].source = u.id; 
+      edges[n].target = v.id;
 
       edges[n].next_out = nodes[u.id].first_out;
@@ -247 +247 @@
         edges[edges[n].prev_in].next_in = edges[n].next_in;
       } else {
-        nodes[edges[n].head].first_in = edges[n].next_in;
+        nodes[edges[n].target].first_in = edges[n].next_in;
       }
 
@@ -258 +258 @@
         edges[edges[n].prev_out].next_out = edges[n].next_out;
       } else {
-        nodes[edges[n].tail].first_out = edges[n].next_out;
+        nodes[edges[n].source].first_out = edges[n].next_out;
       }
       
@@ -273 +273 @@
 
   protected:
-    void _moveHead(Edge e, Node n) 
+    void _moveTarget(Edge e, Node n) 
     {
       if(edges[e.id].next_in != -1)
@@ -279 +279 @@
       if(edges[e.id].prev_in != -1)
         edges[edges[e.id].prev_in].next_in = edges[e.id].next_in;
-      else nodes[edges[e.id].head].first_in = edges[e.id].next_in;
-      edges[e.id].head = n.id;
+      else nodes[edges[e.id].target].first_in = edges[e.id].next_in;
+      edges[e.id].target = n.id;
       edges[e.id].prev_in = -1;
       edges[e.id].next_in = nodes[n.id].first_in;
       nodes[n.id].first_in = e.id;
     }
-    void _moveTail(Edge e, Node n) 
+    void _moveSource(Edge e, Node n) 
     {
       if(edges[e.id].next_out != -1)
@@ -291 +291 @@
       if(edges[e.id].prev_out != -1)
         edges[edges[e.id].prev_out].next_out = edges[e.id].next_out;
-      else nodes[edges[e.id].tail].first_out = edges[e.id].next_out;
-      edges[e.id].tail = n.id;
+      else nodes[edges[e.id].source].first_out = edges[e.id].next_out;
+      edges[e.id].source = n.id;
       edges[e.id].prev_out = -1;
       edges[e.id].next_out = nodes[n.id].first_out;
@@ -321 +321 @@
   {
   public:
-    /// Moves the head of \c e to \c n
-
-    /// Moves the head of \c e to \c n
+    /// Moves the target of \c e to \c n
+
+    /// Moves the target of \c e to \c n
     ///
-    void moveHead(Edge e, Node n) { _moveHead(e,n); }
-    /// Moves the tail of \c e to \c n
-
-    /// Moves the tail of \c e to \c n
+    void moveTarget(Edge e, Node n) { _moveTarget(e,n); }
+    /// Moves the source of \c e to \c n
+
+    /// Moves the source of \c e to \c n
     ///
-    void moveTail(Edge e, Node n) { _moveTail(e,n); }
+    void moveSource(Edge e, Node n) { _moveSource(e,n); }
 
     ///Using this it possible to avoid the superfluous memory allocation.