Changeset 986:e997802b855c in lemon-0.x for src/work/athos/preflow_push_wogw.h

Timestamp:

11/13/04 13:53:28 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Naming changes:

• head -> target
• tail -> source

File:

• src/work/athos/preflow_push_wogw.h (modified) (8 diffs)

src/work/athos/preflow_push_wogw.h

@@ -140 +140 @@
     //This private procedure is supposed to modify the preflow on edge j
     //by value v (which can be positive or negative as well) 
-    //and maintain the excess on the head and tail
+    //and maintain the excess on the target and source
     //Here we do not check whether this is possible or not
     void modify_preflow(Edge j, const T& v){
@@ -148 +148 @@
 
 
-      //Modifiyng the head
-      modify_excess(G.head(j),v);
-        
-      //Modifiyng the tail
-      modify_excess(G.tail(j),-v);
+      //Modifiyng the target
+      modify_excess(G.target(j),v);
+        
+      //Modifiyng the source
+      modify_excess(G.source(j),-v);
 
     }
@@ -273 +273 @@
         InEdgeIt e;
         for(G.first(e,v); G.valid(e); G.next(e)) {
-          Node w=G.tail(e);
+          Node w=G.source(e);
           if ( level[w] == number_of_nodes && w != s ) {
             bfs_queue.push(w);
@@ -311 +311 @@
       for(OutEdgeIt j=G.template first<OutEdgeIt>(s); G.valid(j); G.next(j)){ 
         modify_preflow(j,capacity[j] );
-        make_active(G.head(j));
-        int lev=level[G.head(j)];
+        make_active(G.target(j));
+        int lev=level[G.target(j)];
         if(highest_active<lev){
           highest_active=lev;
@@ -326 +326 @@
 
       if (capacity[j]>preflow[j]){
-        if(level[G.tail(j)]==level[G.head(j)]+1){
+        if(level[G.source(j)]==level[G.target(j)]+1){
           return true;
         }
         else{
-          if (level[G.head(j)] < new_level)
-            new_level=level[G.head(j)];
+          if (level[G.target(j)] < new_level)
+            new_level=level[G.target(j)];
         }
       }
@@ -342 +342 @@
       
       if (0<preflow[j]){
-        if(level[G.tail(j)]==level[G.head(j)]-1){
+        if(level[G.source(j)]==level[G.target(j)]-1){
          
           return true;
         }
         else{
-          if (level[G.tail(j)] < new_level)
-            new_level=level[G.tail(j)];
+          if (level[G.source(j)] < new_level)
+            new_level=level[G.source(j)];
         }
         
@@ -389 +389 @@
               e -= v;
               //New node might become active
-              if (excess[G.head(j)]==0){
-                make_active(G.head(j));
+              if (excess[G.target(j)]==0){
+                make_active(G.target(j));
               }
               modify_preflow(j,v);
@@ -405 +405 @@
               e -= v;
               //New node might become active
-              if (excess[G.tail(j)]==0){
-                make_active(G.tail(j));
+              if (excess[G.source(j)]==0){
+                make_active(G.source(j));
               }
               modify_preflow(j,-v);