Changeset 986:e997802b855c in lemon-0.x for src/lemon/preflow.h

Timestamp:

11/13/04 13:53:28 (20 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/lemon/preflow.h (modified) (16 diffs)

src/lemon/preflow.h

@@ -306 +306 @@
         for(InEdgeIt e(*g,v); e!=INVALID; ++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);
@@ -319 +319 @@
         for(OutEdgeIt e(*g,v); e!=INVALID; ++e) {
           if ( 0 >= (*flow)[e] ) continue;
-          Node u=g->head(e);
+          Node u=g->target(e);
           if ( level[u] >= n ) {
             bfs_queue.push(u);
@@ -411 +411 @@
         
         for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
-          Node v=g->head(e);
+          Node v=g->target(e);
           if (!M[v] && (*flow)[e] < (*capacity)[e] ) {
             queue.push(v);
@@ -419 +419 @@
         
         for(InEdgeIt e(*g,w) ; e!=INVALID; ++e) {
-          Node v=g->tail(e);
+          Node v=g->source(e);
           if (!M[v] && (*flow)[e] > 0 ) {
             queue.push(v);
@@ -449 +449 @@
 
         for(InEdgeIt e(*g,w) ; e!=INVALID; ++e) {
-          Node v=g->tail(e);
+          Node v=g->source(e);
           if (M[v] && (*flow)[e] < (*capacity)[e] ) {
             queue.push(v);
@@ -457 +457 @@
 
         for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
-          Node v=g->head(e);
+          Node v=g->target(e);
           if (M[v] && (*flow)[e] > 0 ) {
             queue.push(v);
@@ -516 +516 @@
       for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
         if ( (*flow)[e] >= (*capacity)[e] ) continue;
-        Node v=g->head(e);
+        Node v=g->target(e);
 
         if( lev > level[v] ) { //Push is allowed now
@@ -548 +548 @@
           
           if( (*flow)[e] <= 0 ) continue;
-          Node v=g->tail(e);
+          Node v=g->source(e);
 
           if( lev > level[v] ) { //Push is allowed now
@@ -603 +603 @@
           for(InEdgeIt e(*g,v) ; e!=INVALID; ++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);
@@ -616 +616 @@
           for(OutEdgeIt e(*g,v) ; e!=INVALID; ++e) {
             if ( 0 >= (*flow)[e] ) continue;
-            Node w=g->head(e);
+            Node w=g->target(e);
             if ( level[w] == n && w != s ) {
               bfs_queue.push(w);
@@ -647 +647 @@
           
           for(InEdgeIt e(*g,v) ; e!=INVALID; ++e) {
-            Node w=g->tail(e);
+            Node w=g->source(e);
             if ( level[w] == n && w != s ) {
               bfs_queue.push(w);
@@ -663 +663 @@
           Num 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 ) { //putting into the stack
@@ -688 +688 @@
           Num 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 ) { //putting into the stack
@@ -701 +701 @@
         for(InEdgeIt e(*g,s); e!=INVALID; ++e) {
           if ( (*flow)[e] <= 0 ) continue;
-          Node w=g->tail(e);
+          Node w=g->source(e);
           if ( level[w] < n ) {
             if ( excess[w] <= 0 && w!=t ) {
@@ -718 +718 @@
           Num rem=(*capacity)[e]-(*flow)[e];
           if ( rem <= 0 ) continue;
-          Node w=g->head(e);
+          Node w=g->target(e);
           if ( level[w] < n ) flow->set(e, (*capacity)[e]);
         }
@@ -724 +724 @@
         for(InEdgeIt e(*g,s) ; e!=INVALID; ++e) {
           if ( (*flow)[e] <= 0 ) continue;
-          Node w=g->tail(e);
+          Node w=g->source(e);
           if ( level[w] < n ) flow->set(e, 0);
         }