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

src/work/marci/augmenting_flow.h

@@ -211 +211 @@
         OutEdgeIt e;
         for(g->first(e,w) ; e!=INVALID; ++e) {
-          Node v=g->head(e);
+          Node v=g->target(e);
           if (!M[v] && (*flow)[e] < (*capacity)[e] ) {
             queue.push(v);
@@ -220 +220 @@
         InEdgeIt f;
         for(g->first(f,w) ; f!=INVALID; ++f) {
-          Node v=g->tail(f);
+          Node v=g->source(f);
           if (!M[v] && (*flow)[f] > 0 ) {
             queue.push(v);
@@ -271 +271 @@
       ResGWEdge e=bfs;
       if (e!=INVALID && 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 (pred[v]!=INVALID) {
@@ -279 +279 @@
           free.set(w, res_cap[e]);
         }
-        if (res_graph.head(e)==t) { _augment=true; break; }
+        if (res_graph.target(e)==t) { _augment=true; break; }
       }
 
@@ -291 +291 @@
         ResGWEdge e=pred[n];
         res_graph.augment(e, augment_value);
-        n=res_graph.tail(e);
+        n=res_graph.source(e);
       }
     }
@@ -330 +330 @@
       ResGWEdge e=bfs;
       if (e!=INVALID && 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 (pred[v]!=INVALID) {
@@ -338 +338 @@
           free.set(w, res_cap[e]);
         }
-        if (res_graph.head(e)==t) { _augment=true; break; }
+        if (res_graph.target(e)==t) { _augment=true; break; }
       }
 
@@ -350 +350 @@
         ResGWEdge e=pred[n];
         res_graph.augment(e, augment_value);
-        n=res_graph.tail(e);
+        n=res_graph.source(e);
       }
     }
@@ -396 +396 @@
       if (e!=INVALID) {
         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);
@@ -404 +404 @@
           residual_capacity.set(f, res_cap[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);
@@ -434 +434 @@
         if (typename MG::Edge(dfs)!=INVALID) {
           if (dfs.isBNodeNewlyReached()) {
-            typename MG::Node v=F.tail(dfs);
-            typename MG::Node w=F.head(dfs);
+            typename MG::Node v=F.source(dfs);
+            typename MG::Node w=F.target(dfs);
             pred.set(w, dfs);
             if (pred[v]!=INVALID) {
@@ -460 +460 @@
           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);
@@ -499 +499 @@
       ResGWEdge e=bfs;
       if (e!=INVALID && bfs.isBNodeNewlyReached())
-        potential.set(res_graph.head(e), potential[res_graph.tail(e)]+1);
+        potential.set(res_graph.target(e), potential[res_graph.source(e)]+1);
       ++bfs;
     } 
@@ -554 +554 @@
           if (dfs.isBNodeNewlyReached()) {
             
-            typename ErasingResGW::Node v=erasing_res_graph.tail(dfs);
-            typename ErasingResGW::Node w=erasing_res_graph.head(dfs);
+            typename ErasingResGW::Node v=erasing_res_graph.source(dfs);
+            typename ErasingResGW::Node w=erasing_res_graph.target(dfs);
 
             pred.set(w, typename ErasingResGW::Edge(dfs));
@@ -586 +586 @@
           typename ErasingResGW::Edge e=pred[n];
           res_graph.augment(e, augment_value);
-          n=erasing_res_graph.tail(e);
+          n=erasing_res_graph.source(e);
           if (res_cap[e]==0)
             erasing_res_graph.erase(e);