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

src/work/jacint/max_flow.h

@@ -327 +327 @@
         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);
@@ -336 +336 @@
         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);
@@ -371 +371 @@
         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);
@@ -380 +380 @@
         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);
@@ -434 +434 @@
 
         if ( (*flow)[e] >= (*capacity)[e] ) continue;
-        Node v=g->head(e);
+        Node v=g->target(e);
 
         if( lev > level[v] ) { //Push is allowed now
@@ -467 +467 @@
 
           if( (*flow)[e] <= 0 ) continue;
-          Node v=g->tail(e);
+          Node v=g->source(e);
 
           if( lev > level[v] ) { //Push is allowed now
@@ -522 +522 @@
             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);
@@ -540 +540 @@
               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 ) active[level[w]].push(w);
@@ -567 +567 @@
             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);
@@ -581 +581 @@
             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);
@@ -600 +600 @@
               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 ) active[level[w]].push(w);
@@ -612 +612 @@
             {
               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);
@@ -711 +711 @@
       //        return dist[n]; }
       //       bool get(const typename MapGraphWrapper::Edge& e) const {
-      //        return (dist.get(g->tail(e))<dist.get(g->head(e))); }
+      //        return (dist.get(g->source(e))<dist.get(g->target(e))); }
       bool operator[](const typename MapGraphWrapper::Edge& e) const {
-        return (dist[g->tail(e)]<dist[g->head(e)]);
+        return (dist[g->source(e)]<dist[g->target(e)]);
       }
     };
@@ -861 +861 @@
       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);
@@ -872 +872 @@
       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);
@@ -926 +926 @@
       ResGWOutEdgeIt e=bfs;
       if (res_graph.valid(e) && bfs.isBNodeNewlyReached()) {
-        Node v=res_graph.tail(e);
-        Node w=res_graph.head(e);
+        Node v=res_graph.source(e);
+        Node w=res_graph.target(e);
         pred.set(w, e);
         if (res_graph.valid(pred[v])) {
@@ -934 +934 @@
           free.set(w, res_graph.resCap(e));
         }
-        if (res_graph.head(e)==t) { _augment=true; break; }
+        if (res_graph.target(e)==t) { _augment=true; break; }
       }
 
@@ -946 +946 @@
         ResGWEdge e=pred[n];
         res_graph.augment(e, augment_value);
-        n=res_graph.tail(e);
+        n=res_graph.source(e);
       }
     }
@@ -984 +984 @@
       ResGWOutEdgeIt e=bfs;
       if (res_graph.valid(e) && bfs.isBNodeNewlyReached()) {
-        Node v=res_graph.tail(e);
-        Node w=res_graph.head(e);
+        Node v=res_graph.source(e);
+        Node w=res_graph.target(e);
         pred.set(w, e);
         if (res_graph.valid(pred[v])) {
@@ -992 +992 @@
           free.set(w, res_graph.resCap(e));
         }
-        if (res_graph.head(e)==t) { _augment=true; break; }
+        if (res_graph.target(e)==t) { _augment=true; break; }
       }
 
@@ -1004 +1004 @@
         ResGWEdge e=pred[n];
         res_graph.augment(e, augment_value);
-        n=res_graph.tail(e);
+        n=res_graph.source(e);
       }
     }
@@ -1051 +1051 @@
       if (res_graph.valid(e)) {
         if (bfs.isBNodeNewlyReached()) {
-          dist.set(res_graph.head(e), dist[res_graph.tail(e)]+1);
-          typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
-                                        res_graph_to_F[res_graph.head(e)]);
+          dist.set(res_graph.target(e), dist[res_graph.source(e)]+1);
+          typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.source(e)],
+                                        res_graph_to_F[res_graph.target(e)]);
           original_edge.update();
           original_edge.set(f, e);
@@ -1059 +1059 @@
           residual_capacity.set(f, res_graph.resCap(e));
         } else {
-          if (dist[res_graph.head(e)]==(dist[res_graph.tail(e)]+1)) {
-            typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
-                                          res_graph_to_F[res_graph.head(e)]);
+          if (dist[res_graph.target(e)]==(dist[res_graph.source(e)]+1)) {
+            typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.source(e)],
+                                          res_graph_to_F[res_graph.target(e)]);
             original_edge.update();
             original_edge.set(f, e);
@@ -1115 +1115 @@
           typename MG::Edge e=pred[n];
           res_graph.augment(original_edge[e], augment_value);
-          n=F.tail(e);
+          n=F.source(e);
           if (residual_capacity[e]==augment_value)
             F.erase(e);
@@ -1148 +1148 @@
       ResGWOutEdgeIt e=bfs;
       if (res_graph.valid(e) && bfs.isBNodeNewlyReached()) {
-        dist.set(res_graph.head(e), dist[res_graph.tail(e)]+1);
+        dist.set(res_graph.target(e), dist[res_graph.source(e)]+1);
       }
       ++bfs;
@@ -1248 +1248 @@
           typename ErasingResGW::OutEdgeIt e=pred[n];
           res_graph.augment(e, augment_value);
-          n=erasing_res_graph.tail(e);
+          n=erasing_res_graph.source(e);
           if (res_graph.resCap(e)==0)
             erasing_res_graph.erase(e);