Changeset 702:bdc7dfc8c054 in lemon-main

Timestamp:

07/09/09 02:39:47 (15 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Bug fix in PairingHeap::pop() (#301)

Files:

• lemon/pairing_heap.h (modified) (1 diff)
• test/heap_test.cc (modified) (1 diff)

lemon/pairing_heap.h

@@ -267 +267 @@
       }
 
+      if (minimum >= 0) container[minimum].left_child = false;
+
       --num_items;
     }

test/heap_test.cc

@@ -223 +223 @@
 
   // PairingHeap
-//  {
-//    typedef PairingHeap<Prio, ItemIntMap> IntHeap;
-//    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
-//    heapSortTest<IntHeap>();
-//    heapIncreaseTest<IntHeap>();
-//
-//    typedef PairingHeap<Prio, IntNodeMap > NodeHeap;
-//    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
-//    dijkstraHeapTest<NodeHeap>(digraph, length, source);
-//  }
+  {
+    typedef PairingHeap<Prio, ItemIntMap> IntHeap;
+    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
+    heapSortTest<IntHeap>();
+    heapIncreaseTest<IntHeap>();
+
+    typedef PairingHeap<Prio, IntNodeMap > NodeHeap;
+    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
+    dijkstraHeapTest<NodeHeap>(digraph, length, source);
+  }
 
   // RadixHeap