Changeset 1728:eb8bb91ba9e2 in lemon-0.x for test/heap_test.cc

Timestamp:

10/14/05 13:03:40 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Updating tests

File:

• test/heap_test.cc (modified) (5 diffs)

test/heap_test.cc

@@ -16 +16 @@
 #include <lemon/fib_heap.h>
 #include <lemon/radix_heap.h>
+#include <lemon/linear_heap.h>
 
 #include "test_tools.h"
@@ -21 +22 @@
 #include "heap_test.h"
 
+#include <lemon/time_measure.h>
 
 using namespace lemon;
@@ -66 +68 @@
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
+    std::cout << timer << std::endl;
   }
   {
@@ -78 +82 @@
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
+    std::cout << timer << std::endl;
   }
   {
@@ -90 +96 @@
     typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
+    std::cout << timer << std::endl;
+  }
+
+  {
+    std::cerr << "Checking Linear Heap" << std::endl;
+
+    typedef LinearHeap<Item, ItemIntMap> IntHeap;
+    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
+    heapSortTest<IntHeap>(100);
+    heapIncreaseTest<IntHeap>(100);
+
+    typedef LinearHeap<Node, Graph::NodeMap<int> > NodeHeap;
+    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    Timer timer;
+    dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
+    std::cout << timer << std::endl;
   }