Changeset 1229:aa65e46aebc3 in lemon-0.x

Timestamp:

03/21/05 08:47:00 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Bugfix, thanks to Janos.

File:

• src/lemon/dijkstra.h (modified) (4 diffs)

src/lemon/dijkstra.h

@@ -473 +473 @@
     ///
     ///\todo _heap_map's type could also be in the traits class.
+    ///\todo The heaps should be able to make themselves empty directly.
     void init()
     {
       create_maps();
-      
+      while(!_heap.empty()) _heap.pop();
       for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
         _pred->set(u,INVALID);
@@ -585 +586 @@
     {
       while ( !_heap.empty() && _heap.top()!=dest ) processNextNode();
-      if ( _heap.top()==dest ) finalizeNodeData(_heap.top());
+      if ( !_heap.empty() ) finalizeNodeData(_heap.top(),_heap.prio());
     }
     
@@ -601 +602 @@
     {
       while ( !_heap.empty() && !nm[_heap.top()] ) processNextNode();
-      if ( !_heap.empty() ) finalizeNodeData(_heap.top());
+      if ( !_heap.empty() ) finalizeNodeData(_heap.top(),_heap.prio());
     }
     
@@ -855 +856 @@
   };
   
-  /// A class to make easier the usage of Dijkstra algorithm
+  /// A class to make the usage of Dijkstra algorithm easier
 
   /// This class is created to make it easier to use Dijkstra algorithm.