Changes in test/dijkstra_test.cc [286:da414906fe21:278:931190050520] in lemon-1.2

File:

• test/dijkstra_test.cc (modified) (3 diffs)

test/dijkstra_test.cc

@@ -23 +23 @@
 #include <lemon/dijkstra.h>
 #include <lemon/path.h>
-#include <lemon/bin_heap.h>
 
 #include "graph_test.h"
@@ -57 +56 @@
   typedef concepts::ReadMap<Digraph::Arc,VType> LengthMap;
   typedef Dijkstra<Digraph, LengthMap> DType;
-  typedef Digraph::Node Node;
-  typedef Digraph::Arc Arc;
 
   Digraph G;
-  Node s, t;
-  Arc e;
+  Digraph::Node n;
+  Digraph::Arc e;
   VType l;
   bool b;
@@ -68 +65 @@
   DType::PredMap p(G);
   LengthMap length;
-  Path<Digraph> pp;
 
-  {
-    DType dijkstra_test(G,length);
+  DType dijkstra_test(G,length);
 
-    dijkstra_test.run(s);
-    dijkstra_test.run(s,t);
+  dijkstra_test.run(n);
 
-    l  = dijkstra_test.dist(t);
-    e  = dijkstra_test.predArc(t);
-    s  = dijkstra_test.predNode(t);
-    b  = dijkstra_test.reached(t);
-    d  = dijkstra_test.distMap();
-    p  = dijkstra_test.predMap();
-    pp = dijkstra_test.path(t);
-  }
-  {
-    DType
-      ::SetPredMap<concepts::ReadWriteMap<Node,Arc> >
-      ::SetDistMap<concepts::ReadWriteMap<Node,VType> >
-      ::SetProcessedMap<concepts::WriteMap<Node,bool> >
-      ::SetStandardProcessedMap
-      ::SetOperationTraits<DijkstraWidestPathOperationTraits<VType> >
-      ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
-      ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
-      ::Create dijkstra_test(G,length);
+  l  = dijkstra_test.dist(n);
+  e  = dijkstra_test.predArc(n);
+  n  = dijkstra_test.predNode(n);
+  d  = dijkstra_test.distMap();
+  p  = dijkstra_test.predMap();
+  b  = dijkstra_test.reached(n);
 
-    dijkstra_test.run(s);
-    dijkstra_test.run(s,t);
-
-    l  = dijkstra_test.dist(t);
-    e  = dijkstra_test.predArc(t);
-    s  = dijkstra_test.predNode(t);
-    b  = dijkstra_test.reached(t);
-    pp = dijkstra_test.path(t);
-  }
-
+  Path<Digraph> pp = dijkstra_test.path(n);
 }