Changes in test/dfs_test.cc [286:da414906fe21:278:931190050520] in lemon-main

File:

• test/dfs_test.cc (modified) (1 diff)

test/dfs_test.cc

@@ -57 +57 @@
   typedef concepts::Digraph Digraph;
   typedef Dfs<Digraph> DType;
-  typedef Digraph::Node Node;
-  typedef Digraph::Arc Arc;
 
   Digraph G;
-  Node s, t;
-  Arc e;
+  Digraph::Node n;
+  Digraph::Arc e;
   int l;
   bool b;
   DType::DistMap d(G);
   DType::PredMap p(G);
-  Path<Digraph> pp;
 
-  {
-    DType dfs_test(G);
+  DType dfs_test(G);
 
-    dfs_test.run(s);
-    dfs_test.run(s,t);
-    dfs_test.run();
+  dfs_test.run(n);
 
-    l  = dfs_test.dist(t);
-    e  = dfs_test.predArc(t);
-    s  = dfs_test.predNode(t);
-    b  = dfs_test.reached(t);
-    d  = dfs_test.distMap();
-    p  = dfs_test.predMap();
-    pp = dfs_test.path(t);
-  }
-  {
-    DType
-      ::SetPredMap<concepts::ReadWriteMap<Node,Arc> >
-      ::SetDistMap<concepts::ReadWriteMap<Node,int> >
-      ::SetReachedMap<concepts::ReadWriteMap<Node,bool> >
-      ::SetProcessedMap<concepts::WriteMap<Node,bool> >
-      ::SetStandardProcessedMap
-      ::Create dfs_test(G);
+  l  = dfs_test.dist(n);
+  e  = dfs_test.predArc(n);
+  n  = dfs_test.predNode(n);
+  d  = dfs_test.distMap();
+  p  = dfs_test.predMap();
+  b  = dfs_test.reached(n);
 
-    dfs_test.run(s);
-    dfs_test.run(s,t);
-    dfs_test.run();
-
-    l  = dfs_test.dist(t);
-    e  = dfs_test.predArc(t);
-    s  = dfs_test.predNode(t);
-    b  = dfs_test.reached(t);
-    pp = dfs_test.path(t);
-  }
+  Path<Digraph> pp = dfs_test.path(n);
 }