diff -r 1559584ca634 -r 50a153b08f07 src/test/preflow_test.cc
--- a/src/test/preflow_test.cc	Thu Oct 07 07:39:42 2004 +0000
+++ b/src/test/preflow_test.cc	Thu Oct 07 17:21:27 2004 +0000
@@ -39,13 +39,13 @@
  
   typedef Preflow<Graph, int, CapMap, FlowMap> PType;
 
-  Graph G;
+  Graph g;
   Node n;
   CapMap cap;
   FlowMap flow;
   CutMap cut;
 
-  PType preflow_test(G,n,n,cap,flow);
+  PType preflow_test(g,n,n,cap,flow);
 
   preflow_test.run();
   preflow_test.flowValue();
@@ -62,12 +62,12 @@
   preflow_test.maxMinCut(cut);
 }
 
-int cut_value ( SmartGraph& G, SmartGraph::NodeMap<bool>& cut, 
+int cut_value ( SmartGraph& g, SmartGraph::NodeMap<bool>& cut, 
 		SmartGraph::EdgeMap<int>& cap) {
   
   int c=0;
-  for(SmartGraph::EdgeIt e(G); e!=INVALID; ++e) {
-    if (cut[G.tail(e)] && !cut[G.head(e)]) c+=cap[e];
+  for(SmartGraph::EdgeIt e(g); e!=INVALID; ++e) {
+    if (cut[g.tail(e)] && !cut[g.head(e)]) c+=cap[e];
   }
   return c;
 }
@@ -97,29 +97,29 @@
   
   check(file, "Input file '" << f_name << "' not found.");
   
-  Graph G;
+  Graph g;
   Node s, t;
-  CapMap cap(G);
-  readDimacs(file, G, cap, s, t);
+  CapMap cap(g);
+  readDimacs(file, g, cap, s, t);
 
-  FlowMap flow(G,0);
+  FlowMap flow(g,0);
 
  
 
-  PType preflow_test(G, s, t, cap, flow);
+  PType preflow_test(g, s, t, cap, flow);
   preflow_test.run(PType::ZERO_FLOW);
     
-  CutMap mincut(G,false);
-  preflow_test.minCut(mincut); 
-  int min_cut_value=cut_value(G,mincut,cap);
+  CutMap min_cut(g,false);
+  preflow_test.minCut(min_cut); 
+  int min_cut_value=cut_value(g,min_cut,cap);
    
-  CutMap minmincut(G,false);
-  preflow_test.minMinCut(minmincut); 
-  int min_min_cut_value=cut_value(G,minmincut,cap);
+  CutMap min_min_cut(g,false);
+  preflow_test.minMinCut(min_min_cut); 
+  int min_min_cut_value=cut_value(g,min_min_cut,cap);
    
-  CutMap maxmincut(G,false);
-  preflow_test.maxMinCut(maxmincut); 
-  int max_min_cut_value=cut_value(G,maxmincut,cap);
+  CutMap max_min_cut(g,false);
+  preflow_test.maxMinCut(max_min_cut); 
+  int max_min_cut_value=cut_value(g,max_min_cut,cap);
 
   check(preflow_test.flowValue() == min_cut_value &&
 	min_cut_value == min_min_cut_value &&
@@ -130,14 +130,14 @@
 
 
 
-  for(EdgeIt e(G); e!=INVALID; ++e) cap[e]=2*cap[e]; 
+  for(EdgeIt e(g); e!=INVALID; ++e) cap[e]=2*cap[e]; 
   preflow_test.setCap(cap);  
 
   preflow_test.phase1(PType::PRE_FLOW);
 
-  CutMap mincut1(G,false);
-  preflow_test.minCut(mincut1); 
-  min_cut_value=cut_value(G,mincut1,cap);
+  CutMap min_cut1(g,false);
+  preflow_test.minCut(min_cut1); 
+  min_cut_value=cut_value(g,min_cut1,cap);
    
   check(preflow_test.flowValue() == min_cut_value &&
 	min_cut_value == 2*flow_value,
@@ -145,16 +145,16 @@
 
   preflow_test.phase2();
 
-  CutMap mincut2(G,false);
-  preflow_test.minCut(mincut2); 
-  min_cut_value=cut_value(G,mincut2,cap);
+  CutMap min_cut2(g,false);
+  preflow_test.minCut(min_cut2); 
+  min_cut_value=cut_value(g,min_cut2,cap);
    
-  CutMap minmincut2(G,false);
-  preflow_test.minMinCut(minmincut2); 
-  min_min_cut_value=cut_value(G,minmincut2,cap);
+  CutMap min_min_cut2(g,false);
+  preflow_test.minMinCut(min_min_cut2); 
+  min_min_cut_value=cut_value(g,min_min_cut2,cap);
  
-  preflow_test.maxMinCut(maxmincut); 
-  max_min_cut_value=cut_value(G,maxmincut,cap);
+  preflow_test.maxMinCut(max_min_cut); 
+  max_min_cut_value=cut_value(g,max_min_cut,cap);
 
   check(preflow_test.flowValue() == min_cut_value &&
 	min_cut_value == min_min_cut_value &&
@@ -164,7 +164,7 @@
 
 
 
-  EdgeIt e(G);
+  EdgeIt e(g);
   for( int i=1; i==10; ++i ) {
     flow.set(e,0);
     ++e;
@@ -172,11 +172,11 @@
 
   preflow_test.setFlow(flow); 
 
-  NodeIt tmp1(G,s);
+  NodeIt tmp1(g,s);
   ++tmp1;
   if ( tmp1 != INVALID ) s=tmp1;
 
-  NodeIt tmp2(G,t);
+  NodeIt tmp2(g,t);
   ++tmp2;
   if ( tmp2 != INVALID ) t=tmp2;
 
@@ -185,16 +185,16 @@
   
   preflow_test.run();
 
-  CutMap mincut3(G,false);
-  preflow_test.minCut(mincut3); 
-  min_cut_value=cut_value(G,mincut3,cap);
+  CutMap min_cut3(g,false);
+  preflow_test.minCut(min_cut3); 
+  min_cut_value=cut_value(g,min_cut3,cap);
    
-  CutMap minmincut3(G,false);
-  preflow_test.minMinCut(minmincut3); 
-  min_min_cut_value=cut_value(G,minmincut3,cap);
+  CutMap min_min_cut3(g,false);
+  preflow_test.minMinCut(min_min_cut3); 
+  min_min_cut_value=cut_value(g,min_min_cut3,cap);
    
-  preflow_test.maxMinCut(maxmincut); 
-  max_min_cut_value=cut_value(G,maxmincut,cap);
+  preflow_test.maxMinCut(max_min_cut); 
+  max_min_cut_value=cut_value(g,max_min_cut,cap);
 
   check(preflow_test.flowValue() == min_cut_value &&
 	min_cut_value == min_min_cut_value &&