Changeset 1330:52ef02524468 in lemon-0.x for src

Timestamp:

04/09/05 21:27:48 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Heap concept moved to namespace concept.

Location:

src

Files:

• lemon/concept/heap.h (added)
• test/heap_test.cc (modified) (5 diffs)

src/test/heap_test.cc

@@ -7 +7 @@
 
 #include <lemon/concept_check.h>
+#include <lemon/concept/heap.h>
 
 #include <lemon/smart_graph.h>
@@ -22 +23 @@
 
 using namespace lemon;
+using namespace lemon::concept;
 
-template <typename Item, typename Prio, typename ItemIntMap>
-class HeapConcept {
-public:  
-
-  template <typename _Heap>
-  struct Constraints {
-  public:
-    
-    void constraints() {
-      Item item;
-      Prio prio;
-
-      ignore_unused_variable_warning(item);
-      ignore_unused_variable_warning(prio);
-
-      typedef typename _Heap::state_enum state_enum;
-      state_enum state;
-
-      ignore_unused_variable_warning(state);
-      
-      _Heap heap1 = _Heap(map);
-
-      ignore_unused_variable_warning(heap1);
-      
-      heap.push(item, prio);
-
-      prio = heap.prio();
-      item = heap.top();
-
-      heap.pop();
-
-      heap.set(item, prio);
-      heap.decrease(item, prio);
-      heap.increase(item, prio);
-      prio = heap[item];
-
-      heap.erase(item);
-
-      state = heap.state(item);
-
-      state = _Heap::PRE_HEAP;
-      state = _Heap::IN_HEAP;
-      state = _Heap::POST_HEAP;
-    }
-    
-    _Heap& heap;
-    ItemIntMap& map;
-
-    Constraints() : heap(0), map(0) {}
-  };
-};
 
 int main() {
@@ -109 +60 @@
 
     typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
-    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
+    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
     
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<HeapConcept<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
   }
@@ -121 +72 @@
 
     typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
-    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
+    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
 
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<HeapConcept<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
   }
@@ -133 +84 @@
 
     typedef RadixHeap<Item, ItemIntMap> IntHeap;
-    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
+    checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>(100);
     heapIncreaseTest<IntHeap>(100);
 
     typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
-    checkConcept<HeapConcept<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
+    checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
   }