Changeset 2439:3f1c7a6c33cd in lemon-0.x

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

Location:

lemon

Files:

• dfs.h (modified) (3 diffs)
• dijkstra.h (modified) (2 diffs)

lemon/dfs.h

@@ -565 +565 @@
     ///
     ///\param em must be a bool (or convertible) edge map. The algorithm
-    ///will stop when it reaches an edge \c e with \code em[e]==true \endcode.
-    ///
-    ///\warning Contrary to \ref Dfs and \ref Dijkstra, \c em is an edge map,
+    ///will stop when it reaches an edge \c e with <tt>em[e]==true<\tt>.
+    ///
+    ///\return The reached edge \c e with <tt>em[e]==true<\tt> or
+    ///\c INVALID if no such edge was found.
+    ///
+    ///\warning Contrary to \ref Bfs and \ref Dijkstra, \c em is an edge map,
     ///not a node map.
     template<class EM>
-    void start(const EM &em)
-    {
-      while ( !emptyQueue() && !em[_stack[_stack_head]] ) processNextEdge();
+    Edge start(const EM &em)
+    {
+      while ( !emptyQueue() && !em[_stack[_stack_head]] )
+        processNextEdge();
+      return emptyQueue() ? INVALID : _stack[_stack_head];
     }
 
@@ -1442 +1447 @@
     /// with addSource() before using this function.
     void start(Node dest) {
-      while ( !emptyQueue() && _graph->target(_stack[_stack_head]) != dest) 
+      while ( !emptyQueue() && _graph->target(_stack[_stack_head]) != dest ) 
         processNextEdge();
     }
@@ -1454 +1459 @@
     ///
     /// \param em must be a bool (or convertible) edge map. The algorithm
-    /// will stop when it reaches an edge \c e with \code nm[e]==true \endcode.
-    ///
-    /// \warning Contrary to \ref Dfs and \ref Dijkstra, \c em is an edge map,
+    /// will stop when it reaches an edge \c e with <tt>em[e]==true<\tt>.
+    ///
+    ///\return The reached edge \c e with <tt>em[e]==true<\tt> or
+    ///\c INVALID if no such edge was found.
+    ///
+    /// \warning Contrary to \ref Bfs and \ref Dijkstra, \c em is an edge map,
     /// not a node map.
     template <typename EM>
-    void start(const EM &em) {
-      while (!emptyQueue() && !em[_stack[_stack_head]]) processNextEdge();
+    Edge start(const EM &em) {
+      while ( !emptyQueue() && !em[_stack[_stack_head]] )
+        processNextEdge();
+      return emptyQueue() ? INVALID : _stack[_stack_head];
     }
 

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();
     }