Changeset 8:cd54905012bc in lemon-0.x

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

Files:

• include/bfs.h (modified) (2 diffs)
• include/graph.h (modified) (4 diffs)
• work/bfsdemo.cc (modified) (4 diffs)
• work/bfsdemo2.cc (modified) (3 diffs)

src/include/bfs.h

@@ -46 +46 @@
   
   struct do_nothing_map {
-    template <typename V,typename T>
-    static void Put(V v,T t) {}
+    template <typename V,typename T> static void Put(V v,T t) {}
+    template <typename G> void SetG(G &g) {}
   };
   
@@ -283 +283 @@
     Graph *G;
     
+    //Bfs(int i): visited_map(G), tree_map(G), dist_map(G), priority_map(G) {}
+    Bfs() {}
+
     void SetG(Graph &Gr)
     {
       G=&Gr;
+      visited_map.SetG(Gr);
+      tree_map.SetG(Gr);
+      dist_map.SetG(Gr);
+      priority_map.SetG(Gr);
     }
     

src/include/graph.h

@@ -76 +76 @@
       bool operator!=(const NodeIterator &i) const {return n!=i.n;}
       
-      int Index() { return n; } //If the nodes are indexable 
+      int Index() const { return n; } //If the nodes are indexable 
       friend class Graph;
       friend class EdgeIterator;
@@ -120 +120 @@
       bool operator!=(const EdgeIterator &i) const {return e!=i.e;}
        
-      int Index() { return e.index.block*EDGE_BLOCK_SIZE+e.index.index; }
+      int Index() const { return e.index.block*EDGE_BLOCK_SIZE+e.index.index; }
       //If the edges are indexable 
 
@@ -402 +402 @@
     public:
       typedef T value_type;
-      void Set(NodeIterator i, const T &t) {map[i.Index()]=t;}
-      T &Get(NodeIterator i) {return map[i.Index()];}
-      T &operator[](NodeIterator i) {return map[i.Index()];}
-
-      void update() { map.resize(G->OldGraph<N,E>::NodeMax());}
-
-      NodeMap(Graph<N,E> &Gr) : map(Gr.OldGraph<N,E>::NodeMax()) { G=&Gr ;}
-      
+      void Put(const NodeIterator i, const T &t) {map[i.Index()]=t;}
+      T Get(const NodeIterator i) const {return map[i.Index()];}
+      T operator[](NodeIterator i) {return map[i.Index()];}
+
+      void update() { map.resize(G->MaxNode());}
+
+      NodeMap() {}
+      void SetG(Graph<N,E> &Gr) { G=&Gr; update();}      
     };
 
@@ -419 +419 @@
     public:
       typedef T value_type;
-      void Set(NodeIterator i, const T &t) {map[i.Index()]=t;}
-      T &Get(NodeIterator i) {return map[i.Index()];}
+      void Put(const NodeIterator i, const T &t) {map[i.Index()]=t;}
+      T &Get(const NodeIterator i) {return map[i.Index()];}
       T &operator[](NodeIterator i) {return map[i.Index()];}
       
       void update()
-        { map.resize(Gr.OldGraph<N,E>::edge_block_num*EDGE_BLOCK_SIZE);}
-      
-      EdgeMap(Graph<N,E> &Gr) 
-        :map(Gr.OldGraph<N,E>::edge_block_num*EDGE_BLOCK_SIZE)
-        { G=&Gr ;}
-      
-    };
+        { map.resize(G->MaxEdge());}
+      
+      EdgeMap() {}
+      void SetG(Graph<N,E> &Gr) 
+      { G=&Gr ;update();}
+      
+    };
+    
+
+    int MaxNode() { return OldGraph<N,E>::MaxNode();}
+    int MaxEdge() { return ::edge_block_num*EDGE_BLOCK_SIZE;}
     
   };

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';
 }