diff -r 82d3dbe912d9 -r 87623302a68f src/work/marci_graph_demo.cc
--- a/src/work/marci_graph_demo.cc	Mon Feb 16 10:57:01 2004 +0000
+++ b/src/work/marci_graph_demo.cc	Mon Feb 16 11:29:48 2004 +0000
@@ -94,7 +94,7 @@
     std::cout << my_property_vector.get(G.tail(j)) << "--" << my_edge_property.get(j) << "-->" << my_property_vector.get(G.head(j)) << " ";
   }
   std::cout << std::endl;
-
+/*
   std::cout << "bfs from the first node" << std::endl;
   bfs<ListGraph> bfs_test(G, G.first<EachNodeIt>());
   bfs_test.run();
@@ -108,7 +108,7 @@
     std::cout << bfs_test.dist.get(i) << " ";
   }
   std::cout<<std::endl;
-
+*/
 
   std::cout << "augmenting path flow algorithm test..." << std::endl;
   ListGraph flowG;
@@ -173,7 +173,7 @@
 
   //flowG.setTail(v3_t, v2);
   //flowG.setHead(v3_t, s);
-
+/*
   for(EachNodeIt i=flowG.first<EachNodeIt>(); i.valid(); ++i) { 
     std::cout << node_name.get(i) << ": ";
     std::cout << "out edges: ";
@@ -188,7 +188,7 @@
   for(EachEdgeIt e=flowG.first<EachEdgeIt>(); e.valid(); ++e) {
     std::cout << node_name.get(flowG.tail(e)) << "-"<< cap.get(e) << "->" << node_name.get(flowG.head(e)) << " ";
   }
-
+*/
   /*
   while (flowG.first<EachEdgeIt>().valid()) {
     flowG.deleteEdge(flowG.first<EachEdgeIt>());
@@ -219,19 +219,39 @@
   }
   */
 
-  std::cout << std::endl;
-  //std::cout << "meg jo" << std::flush;
+  //std::cout << std::endl;
 
-  ListGraph::EdgeMap<int> flow(flowG, 0);
-  MaxFlow<ListGraph, int, ListGraph::EdgeMap<int>, ListGraph::EdgeMap<int> > max_flow_test(flowG, s, t, flow, cap);
-  max_flow_test.run();
 
-  std::cout << "maximum flow: "<< std::endl;
-  for(EachEdgeIt e=flowG.template first<EachEdgeIt>(); e.valid(); ++e) { 
-    std::cout<<"("<<flowG.tail(e)<< "-"<<flow.get(e)<<"->"<<flowG.head(e)<<") ";
+  {
+    ListGraph::EdgeMap<int> flow(flowG, 0);
+    MaxFlow<ListGraph, int, ListGraph::EdgeMap<int>, ListGraph::EdgeMap<int> > max_flow_test(flowG, s, t, flow, cap);
+    max_flow_test.run();
+    
+    std::cout << "maximum flow: "<< std::endl;
+    for(EachEdgeIt e=flowG.template first<EachEdgeIt>(); e.valid(); ++e) { 
+      std::cout<<"("<<flowG.tail(e)<< "-"<<flow.get(e)<<"->"<<flowG.head(e)<<") ";
+    }
+    std::cout<<std::endl;
+    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
   }
-  std::cout<<std::endl;
-  std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+
+  {
+    std::list<NodeIt> S;
+    S.push_back(s); S.push_back(v3);
+    std::list<NodeIt> T;
+    T.push_back(t);
+
+    ListGraph::EdgeMap<int> flow(flowG, 0);
+    MaxFlow2<ListGraph, int, ListGraph::EdgeMap<int>, ListGraph::EdgeMap<int> > max_flow_test(flowG, S, T, flow, cap);
+    max_flow_test.run();
+    
+    std::cout << "maximum flow: "<< std::endl;
+    for(EachEdgeIt e=flowG.template first<EachEdgeIt>(); e.valid(); ++e) { 
+      std::cout<<"("<<flowG.tail(e)<< "-"<<flow.get(e)<<"->"<<flowG.head(e)<<") ";
+    }
+    std::cout<<std::endl;
+    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+  }
 
   return 0;
 }