1.1 --- a/src/work/deba/list_graph.h Sat Nov 13 12:24:01 2004 +0000
1.2 +++ b/src/work/deba/list_graph.h Sat Nov 13 12:53:28 2004 +0000
1.3 @@ -43,7 +43,7 @@
1.4 //The free edges are only single linked using the "next_in" field.
1.5 struct EdgeT
1.6 {
1.7 - int head, tail;
1.8 + int target, source;
1.9 int prev_in, prev_out;
1.10 int next_in, next_out;
1.11 //FIXME: is this necessary?
1.12 @@ -104,14 +104,14 @@
1.13 ///its name would suggests...
1.14 int maxEdgeId() const { return edges.size(); } //FIXME: What is this?
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 aNode(OutEdgeIt e) const { return edges[e.n].tail; }
1.22 - Node aNode(InEdgeIt e) const { return edges[e.n].head; }
1.23 + Node aNode(OutEdgeIt e) const { return edges[e.n].source; }
1.24 + Node aNode(InEdgeIt e) const { return edges[e.n].target; }
1.25
1.26 - Node bNode(OutEdgeIt e) const { return edges[e.n].head; }
1.27 - Node bNode(InEdgeIt e) const { return edges[e.n].tail; }
1.28 + Node bNode(OutEdgeIt e) const { return edges[e.n].target; }
1.29 + Node bNode(InEdgeIt e) const { return edges[e.n].source; }
1.30
1.31 NodeIt& first(NodeIt& v) const {
1.32 v=NodeIt(*this); return v; }
1.33 @@ -151,7 +151,7 @@
1.34 }
1.35 else {
1.36 int n;
1.37 - for(n=nodes[edges[it.n].head].next;
1.38 + for(n=nodes[edges[it.n].target].next;
1.39 n!=-1 && nodes[n].first_in == -1;
1.40 n = nodes[n].next) ;
1.41 it.n = (n==-1)?-1:nodes[n].first_in;
1.42 @@ -207,7 +207,7 @@
1.43 first_free_edge = edges[n].next_in;
1.44 }
1.45
1.46 - edges[n].tail = u.n; edges[n].head = v.n;
1.47 + edges[n].source = u.n; edges[n].target = v.n;
1.48
1.49 edges[n].next_out = nodes[u.n].first_out;
1.50 if(nodes[u.n].first_out != -1) edges[nodes[u.n].first_out].prev_out = n;
1.51 @@ -232,13 +232,13 @@
1.52 edges[edges[n].next_in].prev_in = edges[n].prev_in;
1.53 if(edges[n].prev_in!=-1)
1.54 edges[edges[n].prev_in].next_in = edges[n].next_in;
1.55 - else nodes[edges[n].head].first_in = edges[n].next_in;
1.56 + else nodes[edges[n].target].first_in = edges[n].next_in;
1.57
1.58 if(edges[n].next_out!=-1)
1.59 edges[edges[n].next_out].prev_out = edges[n].prev_out;
1.60 if(edges[n].prev_out!=-1)
1.61 edges[edges[n].prev_out].next_out = edges[n].next_out;
1.62 - else nodes[edges[n].tail].first_out = edges[n].next_out;
1.63 + else nodes[edges[n].source].first_out = edges[n].next_out;
1.64
1.65 edges[n].next_in = first_free_edge;
1.66 first_free_edge = n;