lemon-0.x: comparison src/work/marci_graph

equal deleted inserted replaced

-:0fba37e90468
+:e1511a48d30b
 max_flow_test.augmentOnBlockingFlow<ListGraph>();
 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;*/
-max_flow_test.run();
+//max_flow_test.run();
-std::cout << "maximum flow: "<< std::endl;
+//std::cout << "maximum flow: "<< std::endl;
-for(EachEdgeIt e=flowG.template first<EachEdgeIt>(); e.valid(); ++e) {
+while (max_flow_test.augmentOnShortestPath()) {
-std::cout<<"("<<flowG.tail(e)<< "-"<<flow.get(e)<<"->"<<flowG.head(e)<<") ";
+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<<std::endl;
+}
 std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
 }
 /*
 {
 std::list<NodeIt> S;