Changes in lemon/dijkstra.h [287:bb40b6db0a58:281:e9b4fbe163f5] in lemon-1.0

File:

• lemon/dijkstra.h (modified) (6 diffs)

lemon/dijkstra.h

@@ -725 +725 @@
     }
 
-    ///Executes the algorithm until the given target node is processed.
-
-    ///Executes the algorithm until the given target node is processed.
+    ///Executes the algorithm until the given target node is reached.
+
+    ///Executes the algorithm until the given target node is reached.
     ///
     ///This method runs the %Dijkstra algorithm from the root node(s)
-    ///in order to compute the shortest path to \c t.
+    ///in order to compute the shortest path to \c dest.
     ///
     ///The algorithm computes
-    ///- the shortest path to \c t,
-    ///- the distance of \c t from the root(s).
+    ///- the shortest path to \c dest,
+    ///- the distance of \c dest from the root(s).
     ///
     ///\pre init() must be called and at least one root node should be
     ///added with addSource() before using this function.
-    void start(Node t)
-    {
-      while ( !_heap->empty() && _heap->top()!=t ) processNextNode();
-      if ( !_heap->empty() ) {
-        finalizeNodeData(_heap->top(),_heap->prio());
-        _heap->pop();
-      }
+    void start(Node dest)
+    {
+      while ( !_heap->empty() && _heap->top()!=dest ) processNextNode();
+      if ( !_heap->empty() ) finalizeNodeData(_heap->top(),_heap->prio());
     }
 
@@ -772 +769 @@
     }
 
-    ///Runs the algorithm from the given source node.
+    ///Runs the algorithm from the given node.
 
     ///This method runs the %Dijkstra algorithm from node \c s
@@ -796 +793 @@
 
     ///This method runs the %Dijkstra algorithm from node \c s
-    ///in order to compute the shortest path to node \c t
-    ///(it stops searching when \c t is processed).
-    ///
-    ///\return \c true if \c t is reachable form \c s.
+    ///in order to compute the shortest path to \c t.
+    ///
+    ///\return The length of the shortest <tt>s</tt>--<tt>t</tt> path,
+    ///if \c t is reachable form \c s, \c 0 otherwise.
     ///
     ///\note Apart from the return value, <tt>d.run(s,t)</tt> is just a
@@ -808 +805 @@
     ///  d.start(t);
     ///\endcode
-    bool run(Node s,Node t) {
+    Value run(Node s,Node t) {
       init();
       addSource(s);
       start(t);
-      return (*_heap_cross_ref)[t] == Heap::POST_HEAP;
+      return (*_pred)[t]==INVALID?OperationTraits::zero():(*_dist)[t];
     }
 
@@ -908 +905 @@
     ///Returns \c true if \c v is processed, i.e. the shortest
     ///path to \c v has already found.
-    ///\pre Either \ref run() or \ref init()
+    ///\pre Either \ref run() or \ref start()
     ///must be called before using this function.
     bool processed(Node v) const { return (*_heap_cross_ref)[v] ==
@@ -917 +914 @@
     ///Returns the current distance of a node from the root(s).
     ///It may be decreased in the following processes.
-    ///\pre Either \ref run() or \ref init()
-    ///must be called before using this function and
-    ///node \c v must be reached but not necessarily processed.
-    Value currentDist(Node v) const {
-      return processed(v) ? (*_dist)[v] : (*_heap)[v];
-    }
+    ///\pre \c v should be reached but not processed.
+    Value currentDist(Node v) const { return (*_heap)[v]; }
 
     ///@}