Changeset 1763:49045f2d28d4 in lemon-0.x for lemon/johnson.h

Timestamp:

11/04/05 15:48:10 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2295

Message:

pred => predEdge rename

File:

• lemon/johnson.h (modified) (4 diffs)

lemon/johnson.h

@@ -510 +510 @@
             _dist->set(it, jt, dijkstra.dist(jt) + 
                        potential[jt] - potential[it]);
-            _pred->set(it, jt, dijkstra.pred(jt));
+            _pred->set(it, jt, dijkstra.predEdge(jt));
           } else {
             _dist->set(it, jt, OperationTraits::infinity());
@@ -635 +635 @@
         p.clear();
         typename Path::Builder b(target);
-        for(b.setStartNode(target); pred(source, target) != INVALID;
+        for(b.setStartNode(target); predEdge(source, target) != INVALID;
             target = predNode(target)) {
-          b.pushFront(pred(source, target));
+          b.pushFront(predEdge(source, target));
         }
         b.commit();
@@ -665 +665 @@
     /// \pre \ref run() must be called before using this function.
     /// \todo predEdge could be a better name.
-    Edge pred(Node root, Node node) const { 
+    Edge predEdge(Node root, Node node) const { 
       return (*_pred)(root, node); 
     }
@@ -676 +676 @@
     /// INVALID if \c node is unreachable from the root or if \c node=root. 
     /// The shortest path tree used here is equal to the 
-    /// shortest path tree used in \ref pred().  
+    /// shortest path tree used in \ref predEdge().  
     /// \pre \ref run() must be called before using this function.
     Node predNode(Node root, Node node) const {