Changeset 3:272a5677bd6d in lemon-0.x for src/include/graph.h

Timestamp:

12/13/03 16:44:50 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• Marci type iterator constructors
• src/demo/bfsdemo.cc: demo for bfs.h
• cosmetical changes

File:

• src/include/graph.h (modified) (10 diffs)

src/include/graph.h

@@ -58 +58 @@
       
       NodeIterator() {;} 
+      NodeIterator(Graph<N,E> &Gr)//'const Graph<N,E> &G' would be wrong.
+      {G=&Gr;n=Gr.OldGraph<N,E>::FirstNode();} 
       NodeIterator(const NodeIterator &i) {G=i.G;n=i.n;}
       
@@ -149 +151 @@
     {
     public:
+      InEdgeIterator() {}
+      InEdgeIterator(const Graph<N,E> &Gr,const NodeIterator &n)
+      { G=&Gr; e=Gr.OldGraph<N,E>::FirstIn(n.n);}
+
       InEdgeIterator &GoNext() { e=e->NextIn(); return *this;}
       InEdgeIterator Next() const {return InEdgeIterator(*this).GoNext();}
@@ -170 +176 @@
     {
     public:
+      OutEdgeIterator() {}
+      OutEdgeIterator(Graph<N,E> &Gr,const NodeIterator &n)
+      { G=&Gr; e=Gr.OldGraph<N,E>::FirstOut(n.n);}
+
       OutEdgeIterator &GoNext() { e=e->NextOut(); return *this;}
       OutEdgeIterator Next() const {return OutEdgeIterator(*this).GoNext();}
@@ -193 +203 @@
       
     public:
+      SymEdgeIterator() {}
+      SymEdgeIterator(const Graph<N,E> &Gr,const NodeIterator &nn)
+      { G=&Gr; n=nn; e=Gr.FirstSym(nn.n); }
+
       SymEdgeIterator &GoNext() { e=e->NextEdge(n.n); return *this;}
       SymEdgeIterator Next() const {return SymEdgeIterator(*this).GoNext();}
@@ -217 +231 @@
       
     public:
+      AllEdgeIterator() {}
+      AllEdgeIterator(Graph<N,E> &Gr) : n(Gr)
+      {
+        e=n.isValid()?Gr.OldGraph<N,E>::FirstOut(n.n):NULL;
+      }  
+
       AllEdgeIterator &GoNext()
       {
@@ -249 +269 @@
     typedef SymEdgeIterator DeletingSymEdgeIterator;
     
-    const NodeIterator &FirstNode()
+    const NodeIterator FirstNode()
     {
       NodeIterator i;
@@ -285 +305 @@
     
     //Vagy beginnode()?
-    const DeletingEdgeIterator &FirstOut(const NodeIterator &n)
+    const DeletingEdgeIterator FirstOut(const NodeIterator &n)
     {
       EdgeIterator i;
@@ -291 +311 @@
       return i;
     }
-    const DeletingEdgeIterator &FirstIn(const NodeIterator &n)
+    const DeletingEdgeIterator FirstIn(const NodeIterator &n)
     {
       EdgeIterator i;
@@ -297 +317 @@
       return i;
     }
-    const DeletingSymEdgeIterator &FirstSym(const NodeIterator &n)
+    const DeletingSymEdgeIterator FirstSym(const NodeIterator &n)
     {
       EdgeIterator i;
@@ -369 +389 @@
     
     int NodeNum() { OldGraph<N,E>::NodeNum(); }
-    int Clean() { OldGraph<N,E>::Clean(); }
+    void Clean() { OldGraph<N,E>::Clean(); }
 
     Graph() : _FST(this) {}