1.1 --- a/lemon/johnson.h	Fri Nov 04 13:53:22 2005 +0000
     1.2 +++ b/lemon/johnson.h	Fri Nov 04 14:48:10 2005 +0000
     1.3 @@ -509,7 +509,7 @@
     1.4  	  if (dijkstra.reached(jt)) {
     1.5  	    _dist->set(it, jt, dijkstra.dist(jt) + 
     1.6  		       potential[jt] - potential[it]);
     1.7 -	    _pred->set(it, jt, dijkstra.pred(jt));
     1.8 +	    _pred->set(it, jt, dijkstra.predEdge(jt));
     1.9  	  } else {
    1.10  	    _dist->set(it, jt, OperationTraits::infinity());
    1.11  	    _pred->set(it, jt, INVALID);
    1.12 @@ -634,9 +634,9 @@
    1.13        if (connected(source, target)) {
    1.14  	p.clear();
    1.15  	typename Path::Builder b(target);
    1.16 -	for(b.setStartNode(target); pred(source, target) != INVALID;
    1.17 +	for(b.setStartNode(target); predEdge(source, target) != INVALID;
    1.18  	    target = predNode(target)) {
    1.19 -	  b.pushFront(pred(source, target));
    1.20 +	  b.pushFront(predEdge(source, target));
    1.21  	}
    1.22  	b.commit();
    1.23  	return true;
    1.24 @@ -664,7 +664,7 @@
    1.25      /// shortest path tree used in \ref predNode(). 
    1.26      /// \pre \ref run() must be called before using this function.
    1.27      /// \todo predEdge could be a better name.
    1.28 -    Edge pred(Node root, Node node) const { 
    1.29 +    Edge predEdge(Node root, Node node) const { 
    1.30        return (*_pred)(root, node); 
    1.31      }
    1.32  
    1.33 @@ -675,7 +675,7 @@
    1.34      /// one node from a shortest path from the \c root to \c node. It is 
    1.35      /// INVALID if \c node is unreachable from the root or if \c node=root. 
    1.36      /// The shortest path tree used here is equal to the 
    1.37 -    /// shortest path tree used in \ref pred().  
    1.38 +    /// shortest path tree used in \ref predEdge().  
    1.39      /// \pre \ref run() must be called before using this function.
    1.40      Node predNode(Node root, Node node) const { 
    1.41        return (*_pred)(root, node) == INVALID ?