Changeset 986:e997802b855c in lemon-0.x for src/work/jacint/preflow_excess.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/jacint/preflow_excess.h (modified) (14 diffs)

src/work/jacint/preflow_excess.h

@@ -137 +137 @@
           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] == n && w != s ) {
               bfs_queue.push(w);
@@ -155 +155 @@
           T c=capacity[e];
           if ( c == 0 ) continue;
-          Node w=G.head(e);
+          Node w=G.target(e);
           if ( level[w] < n ) {   
             if ( excess[w] == 0 && w!=t ) active[level[w]].push(w);
@@ -183 +183 @@
           for(G.first(e,v); G.valid(e); G.next(e)) {
             if ( capacity[e] == flow[e] ) continue;
-            Node w=G.tail(e);
+            Node w=G.source(e);
             if ( level[w] == n && w != s ) {
               bfs_queue.push(w);
@@ -197 +197 @@
           for(G.first(f,v); G.valid(f); G.next(f)) {
             if ( 0 == flow[f] ) continue;
-            Node w=G.head(f);
+            Node w=G.target(f);
             if ( level[w] == n && w != s ) {
               bfs_queue.push(w);
@@ -248 +248 @@
           T rem=capacity[e]-flow[e];
           if ( rem == 0 ) continue;
-          Node w=G.head(e);
+          Node w=G.target(e);
           if ( level[w] < n ) {   
             if ( excess[w] == 0 && w!=t ) active[level[w]].push(w);
@@ -260 +260 @@
         {
           if ( flow[f] == 0 ) continue;
-          Node w=G.tail(f);
+          Node w=G.source(f);
           if ( level[w] < n ) {   
             if ( excess[w] == 0 && w!=t ) active[level[w]].push(w);
@@ -304 +304 @@
               for(G.first(e,v); G.valid(e); G.next(e)) {
                 if ( capacity[e] == flow[e] ) continue;
-                Node u=G.tail(e);
+                Node u=G.source(e);
                 if ( level[u] >= n ) { 
                   bfs_queue.push(u);
@@ -315 +315 @@
               for(G.first(f,v); G.valid(f); G.next(f)) {
                 if ( 0 == flow[f] ) continue;
-                Node u=G.head(f);
+                Node u=G.target(f);
                 if ( level[u] >= n ) { 
                   bfs_queue.push(u);
@@ -344 +344 @@
             
             if ( flow[e] == capacity[e] ) continue; 
-            Node v=G.head(e);            
+            Node v=G.target(e);            
             //e=wv          
             
@@ -386 +386 @@
             
             if( flow[e] == 0 ) continue; 
-            Node v=G.tail(e);  
+            Node v=G.source(e);  
             //e=vw
             
@@ -570 +570 @@
         OutEdgeIt e;
         for(G.first(e,w) ; G.valid(e); G.next(e)) {
-          Node v=G.head(e);
+          Node v=G.target(e);
           if (!M[v] && flow[e] < capacity[e] ) {
             queue.push(v);
@@ -579 +579 @@
         InEdgeIt f;
         for(G.first(f,w) ; G.valid(f); G.next(f)) {
-          Node v=G.tail(f);
+          Node v=G.source(f);
           if (!M[v] && flow[f] > 0 ) {
             queue.push(v);
@@ -610 +610 @@
         InEdgeIt e;
         for(G.first(e,w) ; G.valid(e); G.next(e)) {
-          Node v=G.tail(e);
+          Node v=G.source(e);
           if (!M[v] && flow[e] < capacity[e] ) {
             queue.push(v);
@@ -619 +619 @@
         OutEdgeIt f;
         for(G.first(f,w) ; G.valid(f); G.next(f)) {
-          Node v=G.head(f);
+          Node v=G.target(f);
           if (!M[v] && flow[f] > 0 ) {
             queue.push(v);