Changeset 2269:fb1c634fff29 in lemon-0.x

Timestamp:

10/30/06 13:07:52 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3027

Message:

Bug fix for removing heap Item from template parameter list

Files:

• demo/coloring.cc (modified) (1 diff)
• lemon/bipartite_matching.h (modified) (1 diff)
• lemon/dijkstra.h (modified) (1 diff)
• test/all_pairs_shortest_path_test.cc (modified) (1 diff)
• test/heap_test.cc (modified) (4 diffs)
• test/heap_test.h (modified) (1 diff)

demo/coloring.cc

@@ -64 +64 @@
   
   Graph::NodeMap<int> heapMap(graph, -1);
-  BucketHeap<Node, Graph::NodeMap<int> > heap(heapMap);
+  BucketHeap<Graph::NodeMap<int> > heap(heapMap);
   
   for (NodeIt it(graph); it != INVALID; ++it) {

lemon/bipartite_matching.h

@@ -1095 +1095 @@
     ///
     /// \sa BinHeap
-    typedef BinHeap<typename BpUGraph::Node, Value, HeapCrossRef> Heap;
+    typedef BinHeap<Value, HeapCrossRef> Heap;
     
     /// \brief Instantiates a Heap.

lemon/dijkstra.h

@@ -1015 +1015 @@
     ///The heap type used by the dijkstra algorithm.
     typedef typename TR::Heap Heap;
-public:
+  public:
     /// Constructor.
     DijkstraWizard() : TR() {}

test/all_pairs_shortest_path_test.cc

@@ -75 +75 @@
   }
 
-  typedef FibHeap<Node, int, Graph::NodeMap<int> > IntFibHeap;
+  typedef FibHeap<int, Graph::NodeMap<int> > IntFibHeap;
   Johnson<Graph, LengthMap>::DefStandardHeap<IntFibHeap>
     ::Create fibJohnson(graph, length);

test/heap_test.cc

@@ -80 +80 @@
     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);
@@ -94 +94 @@
     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);
@@ -108 +108 @@
     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);
@@ -123 +123 @@
     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);

test/heap_test.h

@@ -25 +25 @@
 public:
   typedef std::vector<int> Parent;
+
+  typedef int Key;
+  typedef int Value;
 
   IntIntMap() : Parent() {}