Changeset 35:65dca0f43fba in lemon-0.x

Timestamp:

01/26/04 12:17:14 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/graphdemo.cc (modified) (5 diffs)

src/work/graphdemo.cc

@@ -44 +44 @@
  
   i=0;
-  for(G.GetFirst(n);n.isValid();n++)
-    for(G.GetFirst(m);m.isValid();++m)
+  for(G.GetFirst(n);n.Valid();n++)
+    for(G.GetFirst(m);m.Valid();++m)
       if(n!=m) G.AddEdge(n,m)->id=++i;
    
@@ -51 +51 @@
 
   TestGraph::AllEdgeIterator a;
-  for(G.GetFirst(a);a.isValid();++a)
+  for(G.GetFirst(a);a.Valid();++a)
     cout << a->id << ":" << a.From()->id << "->" << a.To()->id << "   ";
 
   cout << "\n\n\n";
   
-  for(G.GetFirst(n);n.isValid();++n)
+  for(G.GetFirst(n);n.Valid();++n)
     {
       cout << n->id << "->";
-      for(G.GetFirst(e,n);e.isValid();++e)
+      for(G.GetFirst(e,n);e.Valid();++e)
         cout << e->id << ":" << e.To()->id << ' ';
       cout << '\n';
@@ -71 +71 @@
   
   i=0;
-  for(n=G.First();n.isValid();n++)
-    for(m=G.First();m.isValid();++m)
+  for(n=G.First();n.Valid();n++)
+    for(m=G.First();m.Valid();++m)
       if(n!=m) G.AddEdge(n,m)->id=++i;
    
   ;
-  for(n=G.First();n.isValid();++n) //Demo
+  for(n=G.First();n.Valid();++n) //Demo
     {
       e=G.First(n);
-      while(e.isValid())
+      while(e.Valid())
         if((e->id)%2) G.Delete(e++);  //it may be nice to have a postfix ++
         else ++e;
@@ -86 +86 @@
   // cout << "Number of edges: " << i << "\n\n";
 
-  for(a=G.First();a.isValid();++a)
+  for(a=G.First();a.Valid();++a)
     cout << a->id << ": " << a.From()->id << "->" << a.To()->id << "   ";
   
   cout << "\n\n\n";
   
-  for(n=G.First();n.isValid();++n)
+  for(n=G.First();n.Valid();++n)
     {
       cout << n->id << "->";
-      for(e=G.First(n);e.isValid();++e)
+      for(e=G.First(n);e.Valid();++e)
         cout << e->id << ":" << e.To()->id << ' ';
       cout << '\n';
@@ -108 +108 @@
     
     {  //I would'n say I'm really happy with this.
-      int i;
-      for(TestGraph::NodeIterator n(G);n.isValid();n++)
-        for(TestGraph::NodeIterator m(G);m.isValid();++m)
+      int i=0;
+      for(TestGraph::NodeIterator n(G);n.Valid();n++)
+        for(TestGraph::NodeIterator m(G);m.Valid();++m)
           if(n!=m) G.AddEdge(n,m)->id=++i;
     }
     
-    for(TestGraph::NodeIterator n(G);n.isValid();++n) //Demo
+    for(TestGraph::NodeIterator n(G);n.Valid();++n) //Demo
       {
         TestGraph::OutEdgeIterator e(G,n);
-        while(e.isValid())
+        while(e.Valid())
           if((e->id)%2) G.Delete(e++);  //it may be nice to have a postfix ++
           else ++e;
       }
     
-    for(TestGraph::AllEdgeIterator a(G);a.isValid();++a)
+    for(TestGraph::AllEdgeIterator a(G);a.Valid();++a)
       cout << a->id << ": " << a.From()->id << "->" << a.To()->id << "   ";
     
     cout << "\n\n\n";
     
-    for(TestGraph::NodeIterator n(G);n.isValid();++n)
+    for(TestGraph::NodeIterator n(G);n.Valid();++n)
       {
         cout << n->id << "->";
-        for(TestGraph::OutEdgeIterator e(G,n);e.isValid();++e)
+        for(TestGraph::OutEdgeIterator e(G,n);e.Valid();++e)
           cout << e->id << ":" << e.To()->id << ' ';
         cout << '\n';