Changeset 8:cd54905012bc in lemon-0.x for src/work

Timestamp:

12/16/03 19:17:51 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

-New test: bfsdemo2.cc added

• Graph class has a NodeMap? and an EdgeMap? member class
• default_bfs_T uning the above Maps is added
• a (property)map must provide a member function SetG() to attach the map to a graph

Location:

src/work

Files:

• bfsdemo.cc (modified) (4 diffs)
• bfsdemo2.cc (modified) (3 diffs)

src/work/bfsdemo.cc

@@ -68 +68 @@
     void Put(const IGraph::NodeIterator &n,const value_type &t) { n->isVis=t; }
     value_type Get(const IGraph::NodeIterator &n) const { return n->isVis; }
+    void SetG(IGraph &G) {}
   } visited;
   struct _tree_map_t {
@@ -73 +74 @@
     void Put(const IGraph::NodeIterator &n,const value_type &t)
     { cout << t.From().Index() << "->" << t.To().Index() << '\n'; }
+    void SetG(IGraph &G) {}
   } tree;
   do_nothing_map dist;   //node->int (W)
@@ -90 +92 @@
     void Put(const IGraph::NodeIterator &n,const value_type &t) { n->isVis=t; }
     value_type Get(const IGraph::NodeIterator &n) const { return n->isVis; }
+    void SetG(IGraph &G) {}
   };
   struct tree_map_t {
@@ -95 +98 @@
     void Put(const IGraph::NodeIterator &n,const value_type &t)
     { cout << t.From().Index() << "->" << t.To().Index() << '\n'; }
+    void SetG(IGraph &G) {}
   };
   typedef do_nothing_map dist_map_t;   //node->int (W)

src/work/bfsdemo2.cc

@@ -16 +16 @@
   TestGraph::NodeIterator tn,n2;
   
-  for(int i=1;i<=5000;i++)
+  cout << "Create nodes\n";
+
+  for(int i=1;i<=500;i++)
     {
       *(tn=G.AddNode())=i;
@@ -22 +24 @@
     }
   
+  cout << "Create Edges\n";
+  
   for(TestGraph::NodeIterator n(G);n.isValid();++n)
-    for(TestGraph::NodeIterator m(G);m.isValid();++m)
+    for(TestGraph::NodeIterator m(G);m.isValid();++m) if(n!=m)
       if(gcd(*n,*m)>1) G.AddEdge(n,m);
   
+  
+  cout << "Run BFS\n";
+
   Bfs<default_bfs_T<TestGraph> > bfs;
 
@@ -33 +40 @@
 
   for(TestGraph::NodeIterator n(G);n.isValid();++n)
-    cout << Get(bfs.tree_map,n).From() << "->" << Get(bfs.tree_map,n).To()
-         << '\n';
+    if((*n)!=2)
+      cout << (Get(bfs.dist_map,n)) << '\n';
 
+  for(TestGraph::NodeIterator n(G);n.isValid();++n)
+    if(Get(bfs.dist_map,n))
+      cout << *(Get(bfs.tree_map,n).From()) << "->"
+           << *(Get(bfs.tree_map,n).To())
+           << '\n';
 }