Changeset 30:10a3f2e0928c in lemon-0.x for src/work/preflow_push_hl.hh

Timestamp:

01/21/04 15:51:05 (20 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

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

Message:

is_valid changed to valid

File:

• src/work/preflow_push_hl.hh (modified) (6 diffs)

src/work/preflow_push_hl.hh

@@ -84 +84 @@
       reverse_bfs<list_graph> bfs(G, t);
       bfs.run();
-      for(each_node_iterator v=G.first_node(); v.is_valid(); ++v) {
+      for(each_node_iterator v=G.first_node(); v.valid(); ++v) {
         level.put(v, bfs.dist(v)); 
         //std::cout << "the level of " << v << " is " << bfs.dist(v);
@@ -98 +98 @@
       /* Starting flow. It is everywhere 0 at the moment. */
      
-      for(out_edge_iterator i=G.first_out_edge(s); i.is_valid(); ++i) 
+      for(out_edge_iterator i=G.first_out_edge(s); i.valid(); ++i) 
         {
           node_iterator w=G.head(i);
@@ -130 +130 @@
           int newlevel=2*n-2;                   //In newlevel we maintain the next level of w.
         
-          for(out_edge_iterator e=G.first_out_edge(w); e.is_valid(); ++e) {
+          for(out_edge_iterator e=G.first_out_edge(w); e.valid(); ++e) {
             node_iterator v=G.head(e);
             /*e is the edge wv.*/
@@ -171 +171 @@
             } //if (flow.get(e)<capacity.get(e))
          
-          } //for(out_edge_iterator e=G.first_out_edge(w); e.is_valid(); ++e) 
+          } //for(out_edge_iterator e=G.first_out_edge(w); e.valid(); ++e) 
           
 
 
-          for(in_edge_iterator e=G.first_in_edge(w); e.is_valid(); ++e) {
+          for(in_edge_iterator e=G.first_in_edge(w); e.valid(); ++e) {
             node_iterator v=G.tail(e);
             /*e is the edge vw.*/
@@ -289 +289 @@
         queue.pop();
 
-        for(in_edge_iterator e=G.first_in_edge(w) ; e.is_valid(); ++e) {
+        for(in_edge_iterator e=G.first_in_edge(w) ; e.valid(); ++e) {
           node_iterator v=G.tail(e);
           if (mincutvector.get(v) && flow.get(e) < capacity.get(e) ) {
@@ -297 +297 @@
         } // for
 
-        for(out_edge_iterator e=G.first_out_edge(w) ; e.is_valid(); ++e) {
+        for(out_edge_iterator e=G.first_out_edge(w) ; e.valid(); ++e) {
           node_iterator v=G.head(e);
           if (mincutvector.get(v) && flow.get(e) > 0 ) {