1.1 --- a/src/work/marci/leda/max_bipartite_matching_demo.cc Sat Nov 13 12:24:01 2004 +0000
1.2 +++ b/src/work/marci/leda/max_bipartite_matching_demo.cc Sat Nov 13 12:53:28 2004 +0000
1.3 @@ -103,10 +103,10 @@
1.4 // cout << G.id(n) << ": ";
1.5 // cout << "out edges: ";
1.6 // for(OutEdgeIt e=G.first<OutEdgeIt>(n); G.valid(e); G.next(e))
1.7 -// cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
1.8 +// cout << G.id(G.source(e)) << "->" << G.id(G.target(e)) << " ";
1.9 // cout << "in edges: ";
1.10 // for(InEdgeIt e=G.first<InEdgeIt>(n); G.valid(e); G.next(e))
1.11 -// cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
1.12 +// cout << G.id(G.source(e)) << "->" << G.id(G.target(e)) << " ";
1.13 // cout << endl;
1.14 // }
1.15
1.16 @@ -123,7 +123,7 @@
1.17 int i=0;
1.18 while (max_flow_test.augmentOnShortestPath()) {
1.19 // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.20 -// std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.21 +// std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.22 // std::cout<<std::endl;
1.23 ++i;
1.24 }
1.25 @@ -131,12 +131,12 @@
1.26 // std::cout << "maximum matching: "<< std::endl;
1.27 // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.28 // if (flow.get(e))
1.29 -// std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.30 +// std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.31 // std::cout<<std::endl;
1.32 // std::cout << "edges which are not in this maximum matching: "<< std::endl;
1.33 // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.34 // if (!flow.get(e))
1.35 -// std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.36 +// std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.37 // std::cout<<std::endl;
1.38
1.39 std::cout << "elapsed time: " << ts << std::endl;
1.40 @@ -156,7 +156,7 @@
1.41 // int i=0;
1.42 // while (max_flow_test.augmentOnBlockingFlow2()) {
1.43 // // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.44 -// // std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.45 +// // std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.46 // // std::cout<<std::endl;
1.47 // ++i;
1.48 // }
1.49 @@ -164,12 +164,12 @@
1.50 // // std::cout << "maximum matching: "<< std::endl;
1.51 // // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.52 // // if (flow.get(e))
1.53 -// // std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.54 +// // std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.55 // // std::cout<<std::endl;
1.56 // // std::cout << "edges which are not in this maximum matching: "<< std::endl;
1.57 // // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.58 // // if (!flow.get(e))
1.59 -// // std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.60 +// // std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.61 // // std::cout<<std::endl;
1.62
1.63 // std::cout << "elapsed time: " << ts << std::endl;
1.64 @@ -198,12 +198,12 @@
1.65 // std::cout << "maximum matching: "<< std::endl;
1.66 // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.67 // if (flow.get(e))
1.68 -// std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.69 +// std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.70 // std::cout<<std::endl;
1.71 // std::cout << "edges which are not in this maximum matching: "<< std::endl;
1.72 // for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))
1.73 // if (!flow.get(e))
1.74 -// std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
1.75 +// std::cout << G.id(G.source(e)) << "-" << flow.get(e) << "->" << G.id(G.target(e)) << " ";
1.76 // std::cout<<std::endl;
1.77
1.78