Changeset 944:4f064aff855e in lemon-0.x for src/work/marci/bfs_mm_test.cc

Timestamp:

10/16/04 02:20:13 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

It's time to design an iterable generic bfs

File:

• src/work/marci/bfs_mm_test.cc (copied) (copied from src/test/bfs_test.cc) (4 diffs)

src/work/marci/bfs_mm_test.cc

@@ -15 +15 @@
  */
 
-#include "test_tools.h"
+#include <test/test_tools.h>
 #include <lemon/smart_graph.h>
-#include <lemon/bfs.h>
-#include<lemon/skeletons/graph.h>
+#include <bfs_mm.h>
+#include <lemon/skeletons/graph.h>
 
 using namespace lemon;
@@ -34 +34 @@
   typedef Graph::NodeIt NodeIt;
  
-  typedef Bfs<Graph> BType;
+  typedef marci::Bfs<Graph> BType;
   
   Graph G;
@@ -44 +44 @@
   BType::PredMap p(G);
   BType::PredNodeMap pn(G);
-  
-  BType bfs_test(G);
+
+   Graph::NodeMap<bool> reached(G);
+   Graph::NodeMap<Edge> pred(G);
+   Graph::NodeMap<Node> pred_node(G);
+   Graph::NodeMap<int> dist(G);  
+   BType bfs_test(G, reached, pred, pred_node, dist);
   
   bfs_test.run(n);
@@ -77 +81 @@
   t=ps.inner[0];
   
-  Bfs<Graph> bfs_test(G);
+   Graph::NodeMap<bool> reached(G);
+   Graph::NodeMap<Edge> pred(G);
+   Graph::NodeMap<Node> pred_node(G);
+   Graph::NodeMap<int> dist(G);
+   marci::Bfs<Graph> bfs_test(G, reached, pred, pred_node, dist);
   bfs_test.run(s);
   
-  check(bfs_test.dist(t)==3,"Bfs found a wrong path. " << bfs_test.dist(t));
+//   check(bfs_test.dist(t)==3,"Bfs found a wrong path. " << bfs_test.dist(t));
 
 
-  for(EdgeIt e(G); e==INVALID; ++e) {
-    Node u=G.tail(e);
-    Node v=G.head(e);
-    check( !bfs_test.reached(u) ||
-           (bfs_test.dist(v) > bfs_test.dist(u)+1),
-           "Wrong output.");
-  }
+//   for(EdgeIt e(G); e==INVALID; ++e) {
+//     Node u=G.tail(e);
+//     Node v=G.head(e);
+//     check( !bfs_test.reached(u) ||
+//         (bfs_test.dist(v) > bfs_test.dist(u)+1),
+//         "Wrong output.");
+//   }
 
-  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);
-      Node u=G.tail(e);
-      check(u==bfs_test.predNode(v),"Wrong tree.");
-      check(bfs_test.dist(v) - bfs_test.dist(u) == 1,
-            "Wrong distance. Difference: " 
-            << std::abs(bfs_test.dist(v) - bfs_test.dist(u) 
-                        - 1));
-    }
-  }
+//   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);
+//       Node u=G.tail(e);
+//       check(u==bfs_test.predNode(v),"Wrong tree.");
+//       check(bfs_test.dist(v) - bfs_test.dist(u) == 1,
+//          "Wrong distance. Difference: " 
+//          << std::abs(bfs_test.dist(v) - bfs_test.dist(u) 
+//                      - 1));
+//     }
+//   }
 }