diff options
Diffstat (limited to 'boost/graph/edmonds_karp_max_flow.hpp')
-rw-r--r-- | boost/graph/edmonds_karp_max_flow.hpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/boost/graph/edmonds_karp_max_flow.hpp b/boost/graph/edmonds_karp_max_flow.hpp index 43cc592d2e..8f86fb2026 100644 --- a/boost/graph/edmonds_karp_max_flow.hpp +++ b/boost/graph/edmonds_karp_max_flow.hpp @@ -52,21 +52,21 @@ namespace boost { // find minimum residual capacity along the augmenting path FlowValue delta = (std::numeric_limits<FlowValue>::max)(); - e = p[sink]; + e = get(p, sink); do { BOOST_USING_STD_MIN(); - delta = min BOOST_PREVENT_MACRO_SUBSTITUTION(delta, residual_capacity[e]); + delta = min BOOST_PREVENT_MACRO_SUBSTITUTION(delta, get(residual_capacity, e)); u = source(e, g); - e = p[u]; + e = get(p, u); } while (u != src); // push delta units of flow along the augmenting path - e = p[sink]; + e = get(p, sink); do { - residual_capacity[e] -= delta; - residual_capacity[reverse_edge[e]] += delta; + put(residual_capacity, e, get(residual_capacity, e) - delta); + put(residual_capacity, get(reverse_edge, e), get(residual_capacity, get(reverse_edge, e)) + delta); u = source(e, g); - e = p[u]; + e = get(p, u); } while (u != src); } @@ -94,22 +94,22 @@ namespace boost { typename graph_traits<Graph>::out_edge_iterator ei, e_end; for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) - res[*ei] = cap[*ei]; + put(res, *ei, get(cap, *ei)); - color[sink] = Color::gray(); - while (color[sink] != Color::white()) { + put(color, sink, Color::gray()); + while (get(color, sink) != Color::white()) { boost::queue<vertex_t> Q; breadth_first_search (detail::residual_graph(g, res), src, Q, make_bfs_visitor(record_edge_predecessors(pred, on_tree_edge())), color); - if (color[sink] != Color::white()) + if (get(color, sink) != Color::white()) detail::augment(g, src, sink, pred, res, rev); } // while typename property_traits<CapacityEdgeMap>::value_type flow = 0; for (boost::tie(ei, e_end) = out_edges(src, g); ei != e_end; ++ei) - flow += (cap[*ei] - res[*ei]); + flow += (get(cap, *ei) - get(res, *ei)); return flow; } // edmonds_karp_max_flow() @@ -140,7 +140,7 @@ namespace boost { } }; template<> - struct edmonds_karp_dispatch2<detail::error_property_not_found> { + struct edmonds_karp_dispatch2<param_not_found> { template <class Graph, class PredMap, class P, class T, class R> static typename edge_capacity_value<Graph, P, T, R>::type apply @@ -149,7 +149,7 @@ namespace boost { typename graph_traits<Graph>::vertex_descriptor sink, PredMap pred, const bgl_named_params<P, T, R>& params, - detail::error_property_not_found) + param_not_found) { typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename graph_traits<Graph>::vertices_size_type size_type; @@ -183,13 +183,13 @@ namespace boost { const bgl_named_params<P, T, R>& params, PredMap pred) { - typedef typename property_value< bgl_named_params<P,T,R>, vertex_color_t>::type C; + typedef typename get_param_type< vertex_color_t, bgl_named_params<P,T,R> >::type C; return edmonds_karp_dispatch2<C>::apply (g, src, sink, pred, params, get_param(params, vertex_color)); } }; template<> - struct edmonds_karp_dispatch1<detail::error_property_not_found> { + struct edmonds_karp_dispatch1<param_not_found> { template <class Graph, class P, class T, class R> static typename edge_capacity_value<Graph, P, T, R>::type @@ -198,7 +198,7 @@ namespace boost { typename graph_traits<Graph>::vertex_descriptor src, typename graph_traits<Graph>::vertex_descriptor sink, const bgl_named_params<P, T, R>& params, - detail::error_property_not_found) + param_not_found) { typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename graph_traits<Graph>::vertices_size_type size_type; @@ -206,7 +206,7 @@ namespace boost { num_vertices(g) : 1; std::vector<edge_descriptor> pred_vec(n); - typedef typename property_value< bgl_named_params<P,T,R>, vertex_color_t>::type C; + typedef typename get_param_type< vertex_color_t, bgl_named_params<P,T,R> >::type C; return edmonds_karp_dispatch2<C>::apply (g, src, sink, make_iterator_property_map(pred_vec.begin(), choose_const_pmap @@ -227,7 +227,7 @@ namespace boost { typename graph_traits<Graph>::vertex_descriptor sink, const bgl_named_params<P, T, R>& params) { - typedef typename property_value< bgl_named_params<P,T,R>, vertex_predecessor_t>::type Pred; + typedef typename get_param_type< vertex_predecessor_t, bgl_named_params<P,T,R> >::type Pred; return detail::edmonds_karp_dispatch1<Pred>::apply (g, src, sink, params, get_param(params, vertex_predecessor)); } |