# HG changeset patch
# User marci
# Date 1075899557 0
# Node ID 89d2ce014e123b7d94a2bdd2c9db9ca32924db1f
# Parent  41c7f9c09a12514265b3320af1f41c4f10323770
.

diff -r 41c7f9c09a12 -r 89d2ce014e12 src/work/marci_graph_demo.cc
--- a/src/work/marci_graph_demo.cc	Wed Feb 04 12:46:33 2004 +0000
+++ b/src/work/marci_graph_demo.cc	Wed Feb 04 12:59:17 2004 +0000
@@ -165,6 +165,12 @@
     std::cout << std::endl;
   }
 
+  //flowG.deleteEdge(s_v1);
+  //flowG.deleteEdge(s_v2);
+  //flowG.deleteEdge(v1_v2);
+  //flowG.deleteEdge(v1_v3);
+  
+
   //flowG.setTail(v3_t, v2);
   //flowG.setHead(v3_t, s);
 
@@ -179,6 +185,9 @@
     std::cout << std::endl;
   }
   
+  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()) {
@@ -210,10 +219,18 @@
   }
   */
 
-  //ListGraph::EdgeMap<int> flow(flowG, 0);
-  //ResGraph<ListGraph, int> res_graph(flowG, cap, flow); 
-  max_flow_type<ListGraph, int> max_flow_test(flowG, s, t, cap);
+  std::cout << std::endl;
+  //std::cout << "meg jo" << std::flush;
+
+  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;
+
   return 0;
 }