diff -r 741f3108a90f -r e997802b855c src/work/deba/list_graph.h --- a/src/work/deba/list_graph.h Sat Nov 13 12:24:01 2004 +0000 +++ b/src/work/deba/list_graph.h Sat Nov 13 12:53:28 2004 +0000 @@ -43,7 +43,7 @@ //The free edges are only single linked using the "next_in" field. struct EdgeT { - int head, tail; + int target, source; int prev_in, prev_out; int next_in, next_out; //FIXME: is this necessary? @@ -104,14 +104,14 @@ ///its name would suggests... int maxEdgeId() const { return edges.size(); } //FIXME: What is this? - Node tail(Edge e) const { return edges[e.n].tail; } - Node head(Edge e) const { return edges[e.n].head; } + Node source(Edge e) const { return edges[e.n].source; } + Node target(Edge e) const { return edges[e.n].target; } - Node aNode(OutEdgeIt e) const { return edges[e.n].tail; } - Node aNode(InEdgeIt e) const { return edges[e.n].head; } + Node aNode(OutEdgeIt e) const { return edges[e.n].source; } + Node aNode(InEdgeIt e) const { return edges[e.n].target; } - Node bNode(OutEdgeIt e) const { return edges[e.n].head; } - Node bNode(InEdgeIt e) const { return edges[e.n].tail; } + Node bNode(OutEdgeIt e) const { return edges[e.n].target; } + Node bNode(InEdgeIt e) const { return edges[e.n].source; } NodeIt& first(NodeIt& v) const { v=NodeIt(*this); return v; } @@ -151,7 +151,7 @@ } else { int n; - for(n=nodes[edges[it.n].head].next; + for(n=nodes[edges[it.n].target].next; n!=-1 && nodes[n].first_in == -1; n = nodes[n].next) ; it.n = (n==-1)?-1:nodes[n].first_in; @@ -207,7 +207,7 @@ first_free_edge = edges[n].next_in; } - edges[n].tail = u.n; edges[n].head = v.n; + edges[n].source = u.n; edges[n].target = v.n; edges[n].next_out = nodes[u.n].first_out; if(nodes[u.n].first_out != -1) edges[nodes[u.n].first_out].prev_out = n; @@ -232,13 +232,13 @@ edges[edges[n].next_in].prev_in = edges[n].prev_in; if(edges[n].prev_in!=-1) edges[edges[n].prev_in].next_in = edges[n].next_in; - else nodes[edges[n].head].first_in = edges[n].next_in; + else nodes[edges[n].target].first_in = edges[n].next_in; if(edges[n].next_out!=-1) edges[edges[n].next_out].prev_out = edges[n].prev_out; if(edges[n].prev_out!=-1) edges[edges[n].prev_out].next_out = edges[n].next_out; - else nodes[edges[n].tail].first_out = edges[n].next_out; + else nodes[edges[n].source].first_out = edges[n].next_out; edges[n].next_in = first_free_edge; first_free_edge = n;