boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-01 08:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Fixed argument order to get_param_type

Browse Source 
[SVN r78031]
This commit is contained in:
Jeremiah Willcock
2012-04-16 23:17:12 +00:00
parent 6ea899f7ed
commit 117689a3f9
4 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/graph/biconnected_components.hpp
View File

@@ -243,8 +243,7 @@ namespace boost
DiscoverTimeMap dtm, const bgl_named_params<P, T, R>& params,
LowPointMap lowpt)
{
typedef typename get_param_type< bgl_named_params<P,T,R>,
vertex_predecessor_t>::type dispatch_type;
typedef typename get_param_type< vertex_predecessor_t, bgl_named_params<P,T,R> >::type dispatch_type;
return bicomp_dispatch3<dispatch_type>::apply
(g, comp, out, index_map, dtm, lowpt, params,
@@ -269,8 +268,7 @@ namespace boost
std::vector<vertices_size_type> lowpt(num_vertices(g));
vertices_size_type vst(0);
typedef typename get_param_type< bgl_named_params<P,T,R>,
vertex_predecessor_t>::type dispatch_type;
typedef typename get_param_type< vertex_predecessor_t, bgl_named_params<P,T,R> >::type dispatch_type;
return bicomp_dispatch3<dispatch_type>::apply
(g, comp, out, index_map, dtm,
@@ -288,8 +286,7 @@ namespace boost
ComponentMap comp, OutputIterator out, VertexIndexMap index_map,
const bgl_named_params<P, T, R>& params, DiscoverTimeMap dtm)
{
typedef typename get_param_type< bgl_named_params<P,T,R>,
vertex_lowpoint_t>::type dispatch_type;
typedef typename get_param_type< vertex_lowpoint_t, bgl_named_params<P,T,R> >::type dispatch_type;
return bicomp_dispatch2<dispatch_type>::apply
(g, comp, out, index_map, dtm, params,
@@ -311,8 +308,7 @@ namespace boost
std::vector<vertices_size_type> discover_time(num_vertices(g));
vertices_size_type vst(0);
typedef typename get_param_type< bgl_named_params<P,T,R>,
vertex_lowpoint_t>::type dispatch_type;
typedef typename get_param_type< vertex_lowpoint_t, bgl_named_params<P,T,R> >::type dispatch_type;
return bicomp_dispatch2<dispatch_type>::apply
(g, comp, out, index_map,
@@ -345,8 +341,7 @@ namespace boost
biconnected_components(const Graph& g, ComponentMap comp, OutputIterator out,
const bgl_named_params<P, T, R>& params)
{
typedef typename get_param_type< bgl_named_params<P,T,R>,
vertex_discover_time_t>::type dispatch_type;
typedef typename get_param_type< vertex_discover_time_t, bgl_named_params<P,T,R> >::type dispatch_type;
return detail::bicomp_dispatch1<dispatch_type>::apply(g, comp, out,
choose_const_pmap(get_param(params, vertex_index), g, vertex_index),

6
include/boost/graph/edmonds_karp_max_flow.hpp
View File

@@ -183,7 +183,7 @@ namespace boost {
const bgl_named_params<P, T, R>& params,
PredMap pred)
{
typedef typename get_param_type< 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));
}
@@ -206,7 +206,7 @@ namespace boost {
num_vertices(g) : 1;
std::vector<edge_descriptor> pred_vec(n);
typedef typename get_param_type< 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 get_param_type< 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));
}

3
include/boost/graph/fruchterman_reingold.hpp
View File

@@ -404,8 +404,7 @@ fruchterman_reingold_force_directed_layout
const Topology& topology,
const bgl_named_params<Param, Tag, Rest>& params)
{
typedef typename get_param_type<bgl_named_params<Param,Tag,Rest>,
vertex_displacement_t>::type D;
typedef typename get_param_type<vertex_displacement_t, bgl_named_params<Param,Tag,Rest> >::type D;
detail::fr_force_directed_layout<D>::run
(g, position, topology,

3
include/boost/graph/neighbor_bfs.hpp
View File

@@ -288,8 +288,7 @@ namespace boost {
// graph is not really const since we may write to property maps
// of the graph.
VertexListGraph& ng = const_cast<VertexListGraph&>(g);
typedef typename get_param_type< 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;
detail::neighbor_bfs_dispatch<C>::apply(ng, s, params,
get_param(params, vertex_color));
}