1.1 --- a/demo/sub_graph_adaptor_demo.cc Wed Nov 14 17:53:08 2007 +0000
1.2 +++ b/demo/sub_graph_adaptor_demo.cc Sat Nov 17 20:58:11 2007 +0000
1.3 @@ -109,10 +109,8 @@
1.4 SubGW gw(g, tight_edge_filter);
1.5
1.6 ConstMap<Edge, int> const_1_map(1);
1.7 - Graph::EdgeMap<int> flow(g, 0);
1.8 // Max flow between s and t in the graph of tight edges.
1.9 - Preflow<SubGW, int, ConstMap<Edge, int>, Graph::EdgeMap<int> >
1.10 - preflow(gw, s, t, const_1_map, flow);
1.11 + Preflow<SubGW, ConstMap<Edge, int> > preflow(gw, const_1_map, s, t);
1.12 preflow.run();
1.13
1.14 cout << "maximum number of edge-disjoint shortest paths: "
1.15 @@ -120,7 +118,7 @@
1.16 cout << "edges of the maximum number of edge-disjoint shortest s-t paths: "
1.17 << endl;
1.18 for(EdgeIt e(g); e!=INVALID; ++e)
1.19 - if (flow[e])
1.20 + if (preflow.flow(e) != 0)
1.21 cout << " " << g.id(e) << ", "
1.22 << g.id(g.source(e)) << "--"
1.23 << length[e] << "->" << g.id(g.target(e)) << endl;