diff options
Diffstat (limited to 'boost/graph/distributed/betweenness_centrality.hpp')
| -rw-r--r-- | boost/graph/distributed/betweenness_centrality.hpp | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/boost/graph/distributed/betweenness_centrality.hpp b/boost/graph/distributed/betweenness_centrality.hpp index 04d249a5b8..b56367c0c4 100644 --- a/boost/graph/distributed/betweenness_centrality.hpp +++ b/boost/graph/distributed/betweenness_centrality.hpp @@ -197,21 +197,21 @@ namespace boost { // have not yet been received. void synchronize() { - using boost::graph::parallel::synchronize; + using boost::parallel::synchronize; synchronize(pg); } // Setup triggers for msg_relax messages void setup_triggers() { - using boost::graph::parallel::simple_trigger; + using boost::parallel::simple_trigger; simple_trigger(pg, msg_relax, this, &betweenness_centrality_delta_stepping_impl::handle_msg_relax); } void handle_msg_relax(int /*source*/, int /*tag*/, const std::pair<Vertex, typename MessageValue::type>& data, - trigger_receive_context) + boost::parallel::trigger_receive_context) { relax(data.second.second, data.first, data.second.first); } const Graph& g; @@ -281,7 +281,7 @@ namespace boost { vertex_index(vertex_index), #endif delta(delta), - pg(boost::graph::parallel::process_group_adl(g), attach_distributed_object()), + pg(boost::graph::parallel::process_group_adl(g), boost::parallel::attach_distributed_object()), owner(get(vertex_owner, g)), local(get(vertex_local, g)) @@ -621,12 +621,6 @@ namespace boost { #endif ) { - typedef typename property_traits<DistanceMap>::value_type - distance_type; - - typedef std::plus<distance_type> Combine; - typedef std::less<distance_type> Compare; - // The "distance" map needs to act like one, retrieving the default // value of infinity. set_property_map_role(vertex_distance, distance); @@ -717,7 +711,6 @@ namespace boost { using boost::graph::parallel::process_group; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; - typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator; typedef typename graph_traits<Graph>::edges_size_type edges_size_type; typedef typename property_traits<IncomingMap>::value_type incoming_type; @@ -974,10 +967,7 @@ namespace boost { using boost::detail::graph::divide_centrality_by_two; using boost::graph::parallel::process_group; - typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator; - typedef typename graph_traits<Graph>::edge_iterator edge_iterator; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; - typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type; typedef typename property_traits<DistanceMap>::value_type distance_type; typedef typename property_traits<DependencyMap>::value_type dependency_type; @@ -1064,11 +1054,8 @@ namespace boost { { using boost::detail::graph::update_centrality; - typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; - typedef typename property_traits<IncomingMap>::value_type incoming_type; - // Initialize for this iteration BGL_FORALL_VERTICES_T(w, g, Graph) { // put(path_count, w, 0); @@ -1137,12 +1124,7 @@ namespace boost { using boost::detail::graph::divide_centrality_by_two; using boost::graph::parallel::process_group; - typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator; - typedef typename graph_traits<Graph>::edge_iterator edge_iterator; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; - typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type; - - typedef typename property_traits<DistanceMap>::value_type distance_type; typedef ProcessGroup process_group_type; @@ -1352,10 +1334,6 @@ namespace graph { namespace parallel { namespace detail { typedef typename graph_traits<Graph>::degree_size_type degree_size_type; typedef typename graph_traits<Graph>::edges_size_type edges_size_type; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; - typedef typename mpl::if_c<(is_same<CentralityMap, - dummy_property_map>::value), - EdgeCentralityMap, - CentralityMap>::type a_centrality_map; typename graph_traits<Graph>::vertices_size_type V = num_vertices(g); @@ -1472,9 +1450,6 @@ non_distributed_brandes_betweenness_centrality(const ProcessGroup& pg, VertexIndexMap vertex_index, Buffer sources) { - typedef typename property_traits<DistanceMap>::value_type distance_type; - typedef static_property_map<distance_type> WeightMap; - detail::graph::brandes_unweighted_shortest_paths shortest_paths; graph::parallel::detail::non_distributed_brandes_betweenness_centrality_impl(pg, g, centrality, @@ -1528,7 +1503,6 @@ namespace detail { namespace graph { Buffer sources) { typedef typename graph_traits<Graph>::degree_size_type degree_size_type; - typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename mpl::if_c<(is_same<CentralityMap, dummy_property_map>::value), @@ -1565,7 +1539,6 @@ namespace detail { namespace graph { Buffer sources) { typedef typename graph_traits<Graph>::degree_size_type degree_size_type; - typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename mpl::if_c<(is_same<CentralityMap, dummy_property_map>::value), |