1.1 --- a/test/heap_test.cc	Mon Oct 30 12:01:51 2006 +0000
     1.2 +++ b/test/heap_test.cc	Mon Oct 30 12:07:52 2006 +0000
     1.3 @@ -79,13 +79,13 @@
     1.4    {
     1.5      std::cerr << "Checking Bin Heap" << std::endl;
     1.6  
     1.7 -    typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
     1.8 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     1.9 +    typedef BinHeap<Prio, ItemIntMap> IntHeap;
    1.10 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.11      heapSortTest<IntHeap>(100);
    1.12      heapIncreaseTest<IntHeap>(100);
    1.13      
    1.14 -    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    1.15 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.16 +    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
    1.17 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.18      Timer timer;
    1.19      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    1.20      std::cout << timer << std::endl;
    1.21 @@ -93,13 +93,13 @@
    1.22    {
    1.23      std::cerr << "Checking Fib Heap" << std::endl;
    1.24  
    1.25 -    typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
    1.26 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    1.27 +    typedef FibHeap<Prio, ItemIntMap> IntHeap;
    1.28 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.29      heapSortTest<IntHeap>(100);
    1.30      heapIncreaseTest<IntHeap>(100);
    1.31  
    1.32 -    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    1.33 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.34 +    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
    1.35 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.36      Timer timer;
    1.37      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    1.38      std::cout << timer << std::endl;
    1.39 @@ -107,13 +107,13 @@
    1.40    {
    1.41      std::cerr << "Checking Radix Heap" << std::endl;
    1.42  
    1.43 -    typedef RadixHeap<Item, ItemIntMap> IntHeap;
    1.44 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    1.45 +    typedef RadixHeap<ItemIntMap> IntHeap;
    1.46 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.47      heapSortTest<IntHeap>(100);
    1.48      heapIncreaseTest<IntHeap>(100);
    1.49  
    1.50 -    typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
    1.51 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.52 +    typedef RadixHeap<Graph::NodeMap<int> > NodeHeap;
    1.53 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.54      Timer timer;
    1.55      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    1.56      std::cout << timer << std::endl;
    1.57 @@ -122,13 +122,13 @@
    1.58    {
    1.59      std::cerr << "Checking Bucket Heap" << std::endl;
    1.60  
    1.61 -    typedef BucketHeap<Item, ItemIntMap> IntHeap;
    1.62 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    1.63 +    typedef BucketHeap<ItemIntMap> IntHeap;
    1.64 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    1.65      heapSortTest<IntHeap>(100);
    1.66      heapIncreaseTest<IntHeap>(100);
    1.67  
    1.68 -    typedef BucketHeap<Node, Graph::NodeMap<int> > NodeHeap;
    1.69 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.70 +    typedef BucketHeap<Graph::NodeMap<int> > NodeHeap;
    1.71 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    1.72      Timer timer;
    1.73      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    1.74      std::cout << timer << std::endl;