diff -r 0c7d717b9538 -r eb8bb91ba9e2 test/heap_test.cc --- a/test/heap_test.cc Fri Oct 14 11:02:34 2005 +0000 +++ b/test/heap_test.cc Fri Oct 14 11:03:40 2005 +0000 @@ -15,11 +15,13 @@ #include #include #include +#include #include "test_tools.h" #include "heap_test.h" +#include using namespace lemon; using namespace lemon::concept; @@ -65,7 +67,9 @@ typedef FibHeap > NodeHeap; checkConcept >, NodeHeap>(); + Timer timer; dijkstraHeapTest(graph, length, start); + std::cout << timer << std::endl; } { std::cerr << "Checking Fib Heap" << std::endl; @@ -77,7 +81,9 @@ typedef FibHeap > NodeHeap; checkConcept >, NodeHeap>(); + Timer timer; dijkstraHeapTest(graph, length, start); + std::cout << timer << std::endl; } { std::cerr << "Checking Radix Heap" << std::endl; @@ -89,7 +95,24 @@ typedef RadixHeap > NodeHeap; checkConcept >, NodeHeap>(); + Timer timer; dijkstraHeapTest(graph, length, start); + std::cout << timer << std::endl; + } + + { + std::cerr << "Checking Linear Heap" << std::endl; + + typedef LinearHeap IntHeap; + checkConcept, IntHeap>(); + heapSortTest(100); + heapIncreaseTest(100); + + typedef LinearHeap > NodeHeap; + checkConcept >, NodeHeap>(); + Timer timer; + dijkstraHeapTest(graph, length, start); + std::cout << timer << std::endl; } std::cout << __FILE__ ": All tests passed.\n";