1.1 --- a/lemon/floyd_warshall.h Fri Nov 04 13:53:22 2005 +0000
1.2 +++ b/lemon/floyd_warshall.h Fri Nov 04 14:48:10 2005 +0000
1.3 @@ -488,9 +488,9 @@
1.4 if (connected(source, target)) {
1.5 p.clear();
1.6 typename Path::Builder b(target);
1.7 - for(b.setStartNode(target); pred(source, target) != INVALID;
1.8 + for(b.setStartNode(target); predEdge(source, target) != INVALID;
1.9 target = predNode(target)) {
1.10 - b.pushFront(pred(source, target));
1.11 + b.pushFront(predEdge(source, target));
1.12 }
1.13 b.commit();
1.14 return true;
1.15 @@ -518,7 +518,7 @@
1.16 /// shortest path tree used in \ref predNode().
1.17 /// \pre \ref run() must be called before using this function.
1.18 /// \todo predEdge could be a better name.
1.19 - Edge pred(Node root, Node node) const {
1.20 + Edge predEdge(Node root, Node node) const {
1.21 return (*_pred)(root, node);
1.22 }
1.23
1.24 @@ -529,7 +529,7 @@
1.25 /// one node from a shortest path from the \c root to \c node. It is
1.26 /// INVALID if \c node is unreachable from the root or if \c node=root.
1.27 /// The shortest path tree used here is equal to the
1.28 - /// shortest path tree used in \ref pred().
1.29 + /// shortest path tree used in \ref predEdge().
1.30 /// \pre \ref run() must be called before using this function.
1.31 Node predNode(Node root, Node node) const {
1.32 return (*_pred)(root, node) == INVALID ?