1.1 --- a/test/heap_test.cc	Fri Nov 13 12:33:33 2009 +0100
     1.2 +++ b/test/heap_test.cc	Thu Dec 10 17:05:35 2009 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4   *
     1.5   * This file is a part of LEMON, a generic C++ optimization library.
     1.6   *
     1.7 - * Copyright (C) 2003-2008
     1.8 + * Copyright (C) 2003-2009
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
    1.12 @@ -31,6 +31,9 @@
    1.13  #include <lemon/maps.h>
    1.14  
    1.15  #include <lemon/bin_heap.h>
    1.16 +#include <lemon/fib_heap.h>
    1.17 +#include <lemon/radix_heap.h>
    1.18 +#include <lemon/bucket_heap.h>
    1.19  
    1.20  #include "test_tools.h"
    1.21  
    1.22 @@ -183,5 +186,39 @@
    1.23      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.24    }
    1.25  
    1.26 +  {
    1.27 +    typedef FibHeap<Prio, ItemIntMap> IntHeap;
    1.28 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.29 +    heapSortTest<IntHeap>();
    1.30 +    heapIncreaseTest<IntHeap>();
    1.31 +
    1.32 +    typedef FibHeap<Prio, IntNodeMap > NodeHeap;
    1.33 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.34 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.35 +  }
    1.36 +
    1.37 +  {
    1.38 +    typedef RadixHeap<ItemIntMap> IntHeap;
    1.39 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.40 +    heapSortTest<IntHeap>();
    1.41 +    heapIncreaseTest<IntHeap>();
    1.42 +
    1.43 +    typedef RadixHeap<IntNodeMap > NodeHeap;
    1.44 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.45 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.46 +  }
    1.47 +
    1.48 +  {
    1.49 +    typedef BucketHeap<ItemIntMap> IntHeap;
    1.50 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.51 +    heapSortTest<IntHeap>();
    1.52 +    heapIncreaseTest<IntHeap>();
    1.53 +
    1.54 +    typedef BucketHeap<IntNodeMap > NodeHeap;
    1.55 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.56 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.57 +  }
    1.58 +
    1.59 +
    1.60    return 0;
    1.61  }