diff -r ad15bdd334bf -r fb1c634fff29 test/heap_test.cc
--- a/test/heap_test.cc	Mon Oct 30 12:01:51 2006 +0000
+++ b/test/heap_test.cc	Mon Oct 30 12:07:52 2006 +0000
@@ -79,13 +79,13 @@
   {
     std::cerr << "Checking Bin Heap" << std::endl;
 
-    typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
-    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
+    typedef BinHeap<Prio, ItemIntMap> IntHeap;
+    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
     
-    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
+    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
     Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     std::cout << timer << std::endl;
@@ -93,13 +93,13 @@
   {
     std::cerr << "Checking Fib Heap" << std::endl;
 
-    typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
-    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
+    typedef FibHeap<Prio, ItemIntMap> IntHeap;
+    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
 
-    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
+    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
     Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     std::cout << timer << std::endl;
@@ -107,13 +107,13 @@
   {
     std::cerr << "Checking Radix Heap" << std::endl;
 
-    typedef RadixHeap<Item, ItemIntMap> IntHeap;
-    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
+    typedef RadixHeap<ItemIntMap> IntHeap;
+    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
 
-    typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    typedef RadixHeap<Graph::NodeMap<int> > NodeHeap;
+    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
     Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     std::cout << timer << std::endl;
@@ -122,13 +122,13 @@
   {
     std::cerr << "Checking Bucket Heap" << std::endl;
 
-    typedef BucketHeap<Item, ItemIntMap> IntHeap;
-    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
+    typedef BucketHeap<ItemIntMap> IntHeap;
+    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
 
-    typedef BucketHeap<Node, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    typedef BucketHeap<Graph::NodeMap<int> > NodeHeap;
+    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
     Timer timer;
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     std::cout << timer << std::endl;