Changeset 1763:49045f2d28d4 in lemon-0.x for test

Timestamp:

11/04/05 15:48:10 (14 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

pred => predEdge rename

Location:

test

Files:

• all_pairs_shortest_path_test.cc (modified) (1 diff)
• bfs_test.cc (modified) (2 diffs)
• dfs_test.cc (modified) (2 diffs)
• dijkstra_test.cc (modified) (2 diffs)
• heap_test.h (modified) (1 diff)

test/all_pairs_shortest_path_test.cc

@@ -89 +89 @@
           check(johnson.dist(it, jt) == 
                 johnson.dist(it, johnson.predNode(it, jt)) +
-                length[johnson.pred(it, jt)],
+                length[johnson.predEdge(it, jt)],
                 "Wrong edge in all pairs shortest path");
           check(fibJohnson.dist(it, jt) == 
                 fibJohnson.dist(it, fibJohnson.predNode(it, jt)) +
-                length[fibJohnson.pred(it, jt)],
+                length[fibJohnson.predEdge(it, jt)],
                 "Wrong edge in all pairs shortest path");
           check(floyd.dist(it, jt) == 
                 floyd.dist(it, floyd.predNode(it, jt)) +
-                length[floyd.pred(it, jt)],
+                length[floyd.predEdge(it, jt)],
                 "Wrong edge in all pairs shortest path");
         }

test/bfs_test.cc

@@ -51 +51 @@
   
   l  = bfs_test.dist(n);
-  e  = bfs_test.pred(n);
+  e  = bfs_test.predEdge(n);
   n  = bfs_test.predNode(n);
   d  = bfs_test.distMap();
@@ -122 +122 @@
   for(NodeIt v(G); v==INVALID; ++v) {
     check(bfs_test.reached(v),"Each node should be reached.");
-    if ( bfs_test.pred(v)!=INVALID ) {
-      Edge e=bfs_test.pred(v);
+    if ( bfs_test.predEdge(v)!=INVALID ) {
+      Edge e=bfs_test.predEdge(v);
       Node u=G.source(e);
       check(u==bfs_test.predNode(v),"Wrong tree.");

test/dfs_test.cc

@@ -51 +51 @@
   
   l  = dfs_test.dist(n);
-  e  = dfs_test.pred(n);
+  e  = dfs_test.predEdge(n);
   n  = dfs_test.predNode(n);
   d  = dfs_test.distMap();
@@ -112 +112 @@
   for(NodeIt v(G); v!=INVALID; ++v) {
     check(dfs_test.reached(v),"Each node should be reached.");
-    if ( dfs_test.pred(v)!=INVALID ) {
-      Edge e=dfs_test.pred(v);
+    if ( dfs_test.predEdge(v)!=INVALID ) {
+      Edge e=dfs_test.predEdge(v);
       Node u=G.source(e);
       check(u==dfs_test.predNode(v),"Wrong tree.");

test/dijkstra_test.cc

@@ -55 +55 @@
 
   l  = dijkstra_test.dist(n);
-  e  = dijkstra_test.pred(n);
+  e  = dijkstra_test.predEdge(n);
   n  = dijkstra_test.predNode(n);
   d  = dijkstra_test.distMap();
@@ -136 +136 @@
   for(NodeIt v(G); v!=INVALID; ++v){
     check(dijkstra_test.reached(v),"Each node should be reached.");
-    if ( dijkstra_test.pred(v)!=INVALID ) {
-      Edge e=dijkstra_test.pred(v);
+    if ( dijkstra_test.predEdge(v)!=INVALID ) {
+      Edge e=dijkstra_test.predEdge(v);
       Node u=G.source(e);
       check(u==dijkstra_test.predNode(v),"Wrong tree.");

test/heap_test.h

@@ -94 +94 @@
 
   for(NodeIt v(graph); v!=INVALID; ++v) {
-    if ( dijkstra.reached(v) && dijkstra.pred(v) != INVALID ) {
-      Edge e=dijkstra.pred(v);
+    if ( dijkstra.reached(v) && dijkstra.predEdge(v) != INVALID ) {
+      Edge e=dijkstra.predEdge(v);
       Node u=graph.source(e);
       check( dijkstra.dist(v) - dijkstra .dist(u) == length[e],