1.1 --- a/test/heap_test.cc	Sat Sep 26 07:21:54 2009 +0200
     1.2 +++ b/test/heap_test.cc	Tue Sep 29 13:32:01 2009 +0200
     1.3 @@ -30,12 +30,12 @@
     1.4  #include <lemon/maps.h>
     1.5  
     1.6  #include <lemon/bin_heap.h>
     1.7 -#include <lemon/fourary_heap.h>
     1.8 -#include <lemon/kary_heap.h>
     1.9 +#include <lemon/quad_heap.h>
    1.10 +#include <lemon/dheap.h>
    1.11  #include <lemon/fib_heap.h>
    1.12  #include <lemon/pairing_heap.h>
    1.13  #include <lemon/radix_heap.h>
    1.14 -#include <lemon/binom_heap.h>
    1.15 +#include <lemon/binomial_heap.h>
    1.16  #include <lemon/bucket_heap.h>
    1.17  
    1.18  #include "test_tools.h"
    1.19 @@ -185,26 +185,26 @@
    1.20      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.21    }
    1.22  
    1.23 -  // FouraryHeap
    1.24 +  // QuadHeap
    1.25    {
    1.26 -    typedef FouraryHeap<Prio, ItemIntMap> IntHeap;
    1.27 +    typedef QuadHeap<Prio, ItemIntMap> IntHeap;
    1.28      checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.29      heapSortTest<IntHeap>();
    1.30      heapIncreaseTest<IntHeap>();
    1.31  
    1.32 -    typedef FouraryHeap<Prio, IntNodeMap > NodeHeap;
    1.33 +    typedef QuadHeap<Prio, IntNodeMap > NodeHeap;
    1.34      checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.35      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.36    }
    1.37  
    1.38 -  // KaryHeap
    1.39 +  // DHeap
    1.40    {
    1.41 -    typedef KaryHeap<Prio, ItemIntMap> IntHeap;
    1.42 +    typedef DHeap<Prio, ItemIntMap> IntHeap;
    1.43      checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.44      heapSortTest<IntHeap>();
    1.45      heapIncreaseTest<IntHeap>();
    1.46  
    1.47 -    typedef KaryHeap<Prio, IntNodeMap > NodeHeap;
    1.48 +    typedef DHeap<Prio, IntNodeMap > NodeHeap;
    1.49      checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.50      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.51    }
    1.52 @@ -245,14 +245,14 @@
    1.53      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.54    }
    1.55  
    1.56 -  // BinomHeap
    1.57 +  // BinomialHeap
    1.58    {
    1.59 -    typedef BinomHeap<Prio, ItemIntMap> IntHeap;
    1.60 +    typedef BinomialHeap<Prio, ItemIntMap> IntHeap;
    1.61      checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.62      heapSortTest<IntHeap>();
    1.63      heapIncreaseTest<IntHeap>();
    1.64  
    1.65 -    typedef BinomHeap<Prio, IntNodeMap > NodeHeap;
    1.66 +    typedef BinomialHeap<Prio, IntNodeMap > NodeHeap;
    1.67      checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    1.68      dijkstraHeapTest<NodeHeap>(digraph, length, source);
    1.69    }