diff -r 66156a3498ea -r b4af20d02ae0 test/heap_test.cc --- a/test/heap_test.cc Mon Mar 14 08:56:54 2011 +0100 +++ b/test/heap_test.cc Fri Apr 15 09:26:09 2011 +0200 @@ -31,6 +31,9 @@ #include #include +#include +#include +#include #include "test_tools.h" @@ -183,5 +186,39 @@ dijkstraHeapTest(digraph, length, source); } + { + typedef FibHeap IntHeap; + checkConcept, IntHeap>(); + heapSortTest(); + heapIncreaseTest(); + + typedef FibHeap NodeHeap; + checkConcept, NodeHeap>(); + dijkstraHeapTest(digraph, length, source); + } + + { + typedef RadixHeap IntHeap; + checkConcept, IntHeap>(); + heapSortTest(); + heapIncreaseTest(); + + typedef RadixHeap NodeHeap; + checkConcept, NodeHeap>(); + dijkstraHeapTest(digraph, length, source); + } + + { + typedef BucketHeap IntHeap; + checkConcept, IntHeap>(); + heapSortTest(); + heapIncreaseTest(); + + typedef BucketHeap NodeHeap; + checkConcept, NodeHeap>(); + dijkstraHeapTest(digraph, length, source); + } + + return 0; }