[Lemon-commits] [lemon_svn] marci: r75 - hugo/trunk/src/work

[Lemon SVN]

Author: marci
Date: Wed Feb  4 13:59:17 2004
New Revision: 75

Modified:
   hugo/trunk/src/work/marci_graph_demo.cc

Log:
.


Modified: hugo/trunk/src/work/marci_graph_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci_graph_demo.cc	(original)
+++ hugo/trunk/src/work/marci_graph_demo.cc	Wed Feb  4 13:59:17 2004
@@ -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;
 }