Changeset 1728:eb8bb91ba9e2 in lemon-0.x for test/heap_test.h

Timestamp:

10/14/05 13:03:40 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Updating tests

File:

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

test/heap_test.h

@@ -1 @@
-// -+- c++ -+-
+// -*- c++ -*-
 
 #include <vector>
@@ -66 +66 @@
 
 
-template <typename _Traits, typename _Heap>
-struct DefHeapTraits : public _Traits {
-  typedef _Heap Heap;
-};
-
 template <typename _Graph, typename _LengthMap, typename _Heap>
 void dijkstraHeapTest(_Graph& graph, _LengthMap& length,
@@ -84 +79 @@
   typedef typename Graph::EdgeIt EdgeIt;
 
-  Dijkstra<Graph, LengthMap, 
-    DefHeapTraits<DijkstraDefaultTraits<Graph, LengthMap>, Heap> > 
-    dijkstra(graph, length);
+  typename Dijkstra<Graph, LengthMap>::template DefHeap<Heap>::
+    Create dijkstra(graph, length);
 
   dijkstra.run(start);
@@ -95 +89 @@
     if (dijkstra.reached(u)) {
       check( dijkstra.dist(v) - dijkstra.dist(u) <= length[e],
-             "Error in a shortest path tree edge!");
+             "Error in a shortest path tree edge!");
     }
   }