src/lemon/smart_graph.h
changeset 986 e997802b855c
parent 980 0f1044b7a3af
child 1011 5bd6c7671c9e
     1.1 --- a/src/lemon/smart_graph.h	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/lemon/smart_graph.h	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -55,7 +55,7 @@
     1.4      };
     1.5      struct EdgeT 
     1.6      {
     1.7 -      int head, tail, next_in, next_out;      
     1.8 +      int target, source, next_in, next_out;      
     1.9        //FIXME: is this necessary?
    1.10        EdgeT() : next_in(-1), next_out(-1) {}  
    1.11      };
    1.12 @@ -97,8 +97,8 @@
    1.13      ///\sa id(Edge)
    1.14      int maxId(Edge = INVALID) const { return edges.size()-1; }
    1.15  
    1.16 -    Node tail(Edge e) const { return edges[e.n].tail; }
    1.17 -    Node head(Edge e) const { return edges[e.n].head; }
    1.18 +    Node source(Edge e) const { return edges[e.n].source; }
    1.19 +    Node target(Edge e) const { return edges[e.n].target; }
    1.20  
    1.21      /// Node ID.
    1.22      
    1.23 @@ -127,7 +127,7 @@
    1.24      
    1.25      Edge addEdge(Node u, Node v) {
    1.26        Edge e; e.n=edges.size(); edges.push_back(EdgeT()); //FIXME: Hmmm...
    1.27 -      edges[e.n].tail=u.n; edges[e.n].head=v.n;
    1.28 +      edges[e.n].source=u.n; edges[e.n].target=v.n;
    1.29        edges[e.n].next_out=nodes[u.n].first_out;
    1.30        edges[e.n].next_in=nodes[v.n].first_in;
    1.31        nodes[u.n].first_out=nodes[v.n].first_in=e.n;
    1.32 @@ -211,7 +211,7 @@
    1.33      Edge _findEdge(Node u,Node v, Edge prev = INVALID) 
    1.34      {
    1.35        int e = (prev.n==-1)? nodes[u.n].first_out : edges[prev.n].next_out;
    1.36 -      while(e!=-1 && edges[e].tail!=v.n) e = edges[e].next_out;
    1.37 +      while(e!=-1 && edges[e].source!=v.n) e = edges[e].next_out;
    1.38        prev.n=e;
    1.39        return prev;
    1.40      }
    1.41 @@ -307,8 +307,8 @@
    1.42      {
    1.43        while(s.edge_num>edges.size()) {
    1.44  	edge_observers.erase(Edge(edges.size()-1));
    1.45 -	nodes[edges.back().head].first_in=edges.back().next_in;
    1.46 -	nodes[edges.back().tail].first_out=edges.back().next_out;
    1.47 +	nodes[edges.back().target].first_in=edges.back().next_in;
    1.48 +	nodes[edges.back().source].first_out=edges.back().next_out;
    1.49  	edges.pop_back();
    1.50        }
    1.51        //nodes.resize(s.nodes_num);