1.1 --- a/demo/coloring.cc	Mon Oct 30 12:01:51 2006 +0000
     1.2 +++ b/demo/coloring.cc	Mon Oct 30 12:07:52 2006 +0000
     1.3 @@ -63,7 +63,7 @@
     1.4    Graph::NodeMap<int> color(graph, -2);
     1.5    
     1.6    Graph::NodeMap<int> heapMap(graph, -1);
     1.7 -  BucketHeap<Node, Graph::NodeMap<int> > heap(heapMap);
     1.8 +  BucketHeap<Graph::NodeMap<int> > heap(heapMap);
     1.9    
    1.10    for (NodeIt it(graph); it != INVALID; ++it) {
    1.11      heap.push(it, countOutEdges(graph, it));

     2.1 --- a/lemon/bipartite_matching.h	Mon Oct 30 12:01:51 2006 +0000
     2.2 +++ b/lemon/bipartite_matching.h	Mon Oct 30 12:07:52 2006 +0000
     2.3 @@ -1094,7 +1094,7 @@
     2.4      /// anode graph's node.
     2.5      ///
     2.6      /// \sa BinHeap
     2.7 -    typedef BinHeap<typename BpUGraph::Node, Value, HeapCrossRef> Heap;
     2.8 +    typedef BinHeap<Value, HeapCrossRef> Heap;
     2.9      
    2.10      /// \brief Instantiates a Heap.
    2.11      ///

     3.1 --- a/lemon/dijkstra.h	Mon Oct 30 12:01:51 2006 +0000
     3.2 +++ b/lemon/dijkstra.h	Mon Oct 30 12:07:52 2006 +0000
     3.3 @@ -1014,7 +1014,7 @@
     3.4      typedef typename TR::DistMap DistMap;
     3.5      ///The heap type used by the dijkstra algorithm.
     3.6      typedef typename TR::Heap Heap;
     3.7 -public:
     3.8 +  public:
     3.9      /// Constructor.
    3.10      DijkstraWizard() : TR() {}
    3.11  

     4.1 --- a/test/all_pairs_shortest_path_test.cc	Mon Oct 30 12:01:51 2006 +0000
     4.2 +++ b/test/all_pairs_shortest_path_test.cc	Mon Oct 30 12:07:52 2006 +0000
     4.3 @@ -74,7 +74,7 @@
     4.4      cout << "Johnson: " << timer << endl;
     4.5    }
     4.6  
     4.7 -  typedef FibHeap<Node, int, Graph::NodeMap<int> > IntFibHeap;
     4.8 +  typedef FibHeap<int, Graph::NodeMap<int> > IntFibHeap;
     4.9    Johnson<Graph, LengthMap>::DefStandardHeap<IntFibHeap>
    4.10      ::Create fibJohnson(graph, length);
    4.11    {

     5.1 --- a/test/heap_test.cc	Mon Oct 30 12:01:51 2006 +0000
     5.2 +++ b/test/heap_test.cc	Mon Oct 30 12:07:52 2006 +0000
     5.3 @@ -79,13 +79,13 @@
     5.4    {
     5.5      std::cerr << "Checking Bin Heap" << std::endl;
     5.6  
     5.7 -    typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
     5.8 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     5.9 +    typedef BinHeap<Prio, ItemIntMap> IntHeap;
    5.10 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    5.11      heapSortTest<IntHeap>(100);
    5.12      heapIncreaseTest<IntHeap>(100);
    5.13      
    5.14 -    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    5.15 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.16 +    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
    5.17 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.18      Timer timer;
    5.19      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    5.20      std::cout << timer << std::endl;
    5.21 @@ -93,13 +93,13 @@
    5.22    {
    5.23      std::cerr << "Checking Fib Heap" << std::endl;
    5.24  
    5.25 -    typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
    5.26 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    5.27 +    typedef FibHeap<Prio, ItemIntMap> IntHeap;
    5.28 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    5.29      heapSortTest<IntHeap>(100);
    5.30      heapIncreaseTest<IntHeap>(100);
    5.31  
    5.32 -    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    5.33 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.34 +    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
    5.35 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.36      Timer timer;
    5.37      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    5.38      std::cout << timer << std::endl;
    5.39 @@ -107,13 +107,13 @@
    5.40    {
    5.41      std::cerr << "Checking Radix Heap" << std::endl;
    5.42  
    5.43 -    typedef RadixHeap<Item, ItemIntMap> IntHeap;
    5.44 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    5.45 +    typedef RadixHeap<ItemIntMap> IntHeap;
    5.46 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    5.47      heapSortTest<IntHeap>(100);
    5.48      heapIncreaseTest<IntHeap>(100);
    5.49  
    5.50 -    typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
    5.51 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.52 +    typedef RadixHeap<Graph::NodeMap<int> > NodeHeap;
    5.53 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.54      Timer timer;
    5.55      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    5.56      std::cout << timer << std::endl;
    5.57 @@ -122,13 +122,13 @@
    5.58    {
    5.59      std::cerr << "Checking Bucket Heap" << std::endl;
    5.60  
    5.61 -    typedef BucketHeap<Item, ItemIntMap> IntHeap;
    5.62 -    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
    5.63 +    typedef BucketHeap<ItemIntMap> IntHeap;
    5.64 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    5.65      heapSortTest<IntHeap>(100);
    5.66      heapIncreaseTest<IntHeap>(100);
    5.67  
    5.68 -    typedef BucketHeap<Node, Graph::NodeMap<int> > NodeHeap;
    5.69 -    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.70 +    typedef BucketHeap<Graph::NodeMap<int> > NodeHeap;
    5.71 +    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    5.72      Timer timer;
    5.73      dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
    5.74      std::cout << timer << std::endl;

     6.1 --- a/test/heap_test.h	Mon Oct 30 12:01:51 2006 +0000
     6.2 +++ b/test/heap_test.h	Mon Oct 30 12:07:52 2006 +0000
     6.3 @@ -25,6 +25,9 @@
     6.4  public:
     6.5    typedef std::vector<int> Parent;
     6.6  
     6.7 +  typedef int Key;
     6.8 +  typedef int Value;
     6.9 +
    6.10    IntIntMap() : Parent() {}
    6.11    IntIntMap(int n) : Parent(n) {}
    6.12    IntIntMap(int n, int v) : Parent(n, v) {}