diff -r 741f3108a90f -r e997802b855c src/lemon/list_graph.h --- a/src/lemon/list_graph.h Sat Nov 13 12:24:01 2004 +0000 +++ b/src/lemon/list_graph.h Sat Nov 13 12:53:28 2004 +0000 @@ -43,7 +43,7 @@ }; struct EdgeT { - int head, tail; + int target, source; int prev_in, prev_out; int next_in, next_out; }; @@ -111,8 +111,8 @@ ///\sa id(Edge) 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; } void first(Node& node) const { @@ -137,7 +137,7 @@ edge.id = edges[edge.id].next_in; } 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); edge.id = (n == -1) ? -1 : nodes[n].first_in; @@ -198,8 +198,8 @@ first_free_edge = edges[n].next_in; } - 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; if(nodes[u.id].first_out != -1) { @@ -246,7 +246,7 @@ 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; + nodes[edges[n].target].first_in = edges[n].next_in; } @@ -257,7 +257,7 @@ 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; + nodes[edges[n].source].first_out = edges[n].next_out; } edges[n].next_in = first_free_edge; @@ -272,26 +272,26 @@ } protected: - void _moveHead(Edge e, Node n) + void _moveTarget(Edge e, Node n) { if(edges[e.id].next_in != -1) edges[edges[e.id].next_in].prev_in = edges[e.id].prev_in; 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) edges[edges[e.id].next_out].prev_out = edges[e.id].prev_out; 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; nodes[n.id].first_out = e.id; @@ -320,16 +320,16 @@ class ListGraph : public ErasableListGraphBase { public: - /// Moves the head of \c e to \c n + /// Moves the target of \c e to \c n - /// Moves the head 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 + void moveTarget(Edge e, Node n) { _moveTarget(e,n); } + /// Moves the source of \c e to \c n - /// Moves the tail 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. ///\todo more docs...