Changeset 1206:9c398137c2cb in lemon-0.x for src/test/heap_test.h

Timestamp:

03/09/05 15:10:21 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Increase test
Changing test graph

File:

• src/test/heap_test.h (modified) (3 diffs)

src/test/heap_test.h

@@ -1 +1 @@
 // -+- c++ -+-
+
 #include <vector>
 #include <algorithm>
-
-#include <lemon/bin_heap.h>
-#include <lemon/fib_heap.h>
-#include <lemon/radix_heap.h>
 
 #include <lemon/dijkstra.h>
@@ -43 +40 @@
 }
 
+template <typename _Heap>
+void heapIncreaseTest(int n) {
+  typedef _Heap Heap;
+  IntIntMap map(n, -1);
+
+  Heap heap(map);
+  
+  std::vector<int> v(n);
+
+  for (int i = 0; i < n; ++i) {
+    v[i] = rand() % 1000;
+    heap.push(i, v[i]);
+  }
+  for (int i = 0; i < n; ++i) {
+    v[i] += rand() % 1000;
+    heap.increase(i, v[i]);
+  }
+  std::sort(v.begin(), v.end());
+  for (int i = 0; i < n; ++i) {
+    check(v[i] == heap.prio() ,"Wrong order in heap increase test.");
+    heap.pop();
+  }
+}
+
+
+
 template <typename _Traits, typename _Heap>
 struct DefHeapTraits : public _Traits {
@@ -77 +100 @@
 
   for(NodeIt v(graph); v!=INVALID; ++v) {
-    if ( dijkstra.reached(v) ) {
+    if ( dijkstra.reached(v) && dijkstra.pred(v) != INVALID ) {
       Edge e=dijkstra.pred(v);
       Node u=graph.source(e);