Changeset 505:8589c0658839 in lemon-0.x

Timestamp:

05/03/04 11:00:09 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

I changed it to correspond changing requirements

File:

• src/work/athos/preflow_push.hh (modified) (6 diffs)

src/work/athos/preflow_push.hh

@@ -26 +26 @@
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
+    typedef typename Graph::EdgeMap<T> CapacityType;
+
+    typedef ResGraphWrapper<const Graph,int,CapacityType,CapacityType> ResGraphType;
 
 
@@ -48 +51 @@
     Node s;
     Node t;
-    typename Graph::EdgeMap<T> &capacity;
+    CapacityType &capacity;
 
     //output
-    typename Graph::EdgeMap<T> preflow;
+    CapacityType preflow;
     T maxflow_value;
   
@@ -132 +135 @@
       cout<<endl;
     }
-
+    /*
     //Modifies the excess of the node and makes sufficient changes
     void modify_excess(const Node& a ,T v){
@@ -156 +159 @@
 
     }
-
+    */
     //Gives the active node to work with 
     //(depending on the implementation to be used)
@@ -379 +382 @@
 
 
+        //Out edges from node a
+        {
+          ResGraphType::OutEdgeIt j=res_graph.first(j,a);
+          while (res_graph.valid(j) && e){
+            if (is_admissible_forward_edge(j,new_level)){
+              v=min(e,res_graph.resCap(j));
+              e -= v;
+              //New node might become active
+              if (excess[res_graph.head(j)]==0){
+                make_active(res_graph.head(j));
+              }
+              res_graph.augment(j,v);
+              excess[res_graph.tail(j)] -= v;
+              excess[res_graph.head(j)] += v;
+            }
+            res_graph.next(j);
+          }
+        }
+
+        /*
         //Out edges from node a
         {
@@ -412 +435 @@
           }
         }
+        */
 
         //if (G.id(a)==999)