Changeset 278:931190050520 in lemon for test/dijkstra_test.cc

Timestamp:

09/22/08 15:33:23 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Improve the function-type interface of bfs, dfs, and dijkstra (ticket #96)

• BfsWizard? and DfsWizard? have run(s), run(s,t), and run() functions, DijkstraWizard? has run(s) and run(s,t) functions.
• Set NodeMap?<T> instead of NullMap? as PredMap? and DistMap? in the default traits classes for the function-type interface.
• Modify the related test files.
• Doc improvements.
• Bug fix in concepts/path.h.

File:

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

test/dijkstra_test.cc

@@ -21 +21 @@
 #include <lemon/list_graph.h>
 #include <lemon/lgf_reader.h>
-
 #include <lemon/dijkstra.h>
 #include <lemon/path.h>
@@ -65 +64 @@
   DType::DistMap d(G);
   DType::PredMap p(G);
-  //  DType::PredNodeMap pn(G);
   LengthMap length;
 
@@ -77 +75 @@
   d  = dijkstra_test.distMap();
   p  = dijkstra_test.predMap();
-  //  pn = dijkstra_test.predNodeMap();
   b  = dijkstra_test.reached(n);
 
@@ -92 +89 @@
 
   Digraph g;
-  dijkstra(g,LengthMap(),Node()).run();
-  dijkstra(g,LengthMap()).source(Node()).run();
+  bool b;
+  dijkstra(g,LengthMap()).run(Node());
+  b=dijkstra(g,LengthMap()).run(Node(),Node());
   dijkstra(g,LengthMap())
-    .predMap(concepts::WriteMap<Node,Arc>())
-    .distMap(concepts::WriteMap<Node,VType>())
+    .predMap(concepts::ReadWriteMap<Node,Arc>())
+    .distMap(concepts::ReadWriteMap<Node,VType>())
+    .processedMap(concepts::WriteMap<Node,bool>())
     .run(Node());
+  b=dijkstra(g,LengthMap())
+    .predMap(concepts::ReadWriteMap<Node,Arc>())
+    .distMap(concepts::ReadWriteMap<Node,VType>())
+    .processedMap(concepts::WriteMap<Node,bool>())
+    .path(concepts::Path<Digraph>())
+    .dist(VType())
+    .run(Node(),Node());
 }
 
@@ -123 +129 @@
 
   Path<Digraph> p = dijkstra_test.path(t);
-  check(p.length()==3,"getPath() found a wrong path.");
+  check(p.length()==3,"path() found a wrong path.");
   check(checkPath(G, p),"path() found a wrong path.");
   check(pathSource(G, p) == s,"path() found a wrong path.");
@@ -133 +139 @@
     check( !dijkstra_test.reached(u) ||
            (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
-           "dist(target)-dist(source)-arc_length= " <<
+           "Wrong output. dist(target)-dist(source)-arc_length=" <<
            dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
   }