Changeset 2269:fb1c634fff29 in lemon-0.x for test/heap_test.cc

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

File:

• test/heap_test.cc (modified) (4 diffs)

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);