Changeset 2439:3f1c7a6c33cd in lemon-0.x for lemon/dijkstra.h

Timestamp:

05/07/07 10:49:57 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Modified start() function in Dfs and Dijkstra classes to give back reached
edge/node.

Patch from Peter Kovacs

File:

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

lemon/dijkstra.h

@@ -602 +602 @@
     Node nextNode()
     { 
-      return _heap->empty()?_heap->top():INVALID;
+      return !_heap->empty()?_heap->top():INVALID;
     }
  
@@ -665 +665 @@
     ///\param nm must be a bool (or convertible) node map. The algorithm
     ///will stop when it reaches a node \c v with <tt>nm[v]==true</tt>.
+    ///
+    ///\return The reached node \c v with <tt>nm[v]==true<\tt> or
+    ///\c INVALID if no such node was found.
     template<class NodeBoolMap>
-    void start(const NodeBoolMap &nm)
+    Node start(const NodeBoolMap &nm)
     {
       while ( !_heap->empty() && !nm[_heap->top()] ) processNextNode();
-      if ( !_heap->empty() ) finalizeNodeData(_heap->top(),_heap->prio());
+      if ( _heap->empty() ) return INVALID;
+      finalizeNodeData(_heap->top(),_heap->prio());
+      return _heap->top();
     }