diff -r 1bfaec33215b -r 52ef02524468 src/test/heap_test.cc
--- a/src/test/heap_test.cc	Fri Apr 08 15:46:12 2005 +0000
+++ b/src/test/heap_test.cc	Sat Apr 09 19:27:48 2005 +0000
@@ -6,6 +6,7 @@
 #include <vector>
 
 #include <lemon/concept_check.h>
+#include <lemon/concept/heap.h>
 
 #include <lemon/smart_graph.h>
 
@@ -21,58 +22,8 @@
 
 
 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() {
 
@@ -108,36 +59,36 @@
     std::cerr << "Checking Bin Heap" << std::endl;
 
     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);
   }
   {
     std::cerr << "Checking Fib Heap" << std::endl;
 
     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);
   }
   {
     std::cerr << "Checking Radix Heap" << std::endl;
 
     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);
   }