diff -r 2305167d2491 -r 76689f2fc02d test/heap_test.cc --- a/test/heap_test.cc Thu Nov 05 16:01:39 2009 +0100 +++ b/test/heap_test.cc Thu Dec 10 17:10:25 2009 +0100 @@ -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; }