[Boost-commit] svn:boost r78031 - in trunk/boost/graph: . distributed

Subject: [Boost-commit] svn:boost r78031 - in trunk/boost/graph: . distributed
From: jewillco_at_[hidden]
Date: 2012-04-16 19:17:13

Author: jewillco
Date: 2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
New Revision: 78031
URL: http://svn.boost.org/trac/boost/changeset/78031

Log:
Fixed argument order to get_param_type
Text files modified: 
   trunk/boost/graph/biconnected_components.hpp              |    15 +++++----------                         
   trunk/boost/graph/distributed/dijkstra_shortest_paths.hpp |     3 +--                                     
   trunk/boost/graph/edmonds_karp_max_flow.hpp               |     6 +++---                                  
   trunk/boost/graph/fruchterman_reingold.hpp                |     3 +--                                     
   trunk/boost/graph/neighbor_bfs.hpp                        |     3 +--                                     
   5 files changed, 11 insertions(+), 19 deletions(-)

Modified: trunk/boost/graph/biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/biconnected_components.hpp	(original)
+++ trunk/boost/graph/biconnected_components.hpp	2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
@@ -243,8 +243,7 @@
           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 @@
     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 @@
           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 @@
         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 @@
   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), 

Modified: trunk/boost/graph/distributed/dijkstra_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/distributed/dijkstra_shortest_paths.hpp	(original)
+++ trunk/boost/graph/distributed/dijkstra_shortest_paths.hpp	2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
@@ -190,8 +190,7 @@
                                   IndexMap> DefColorMap;
     DefColorMap color_map(color.begin(), index_map);
 
-    typedef typename get_param_type< bgl_named_params<T, Tag, Base>,
-      vertex_color_t>::type color_map_type;
+    typedef typename get_param_type< vertex_color_t, bgl_named_params<T, Tag, Base> >::type color_map_type;
 
     graph::detail::parallel_dijkstra_impl<color_map_type>
       ::run(g, s, predecessor, distance, 

Modified: trunk/boost/graph/edmonds_karp_max_flow.hpp
==============================================================================
--- trunk/boost/graph/edmonds_karp_max_flow.hpp	(original)
+++ trunk/boost/graph/edmonds_karp_max_flow.hpp	2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
@@ -183,7 +183,7 @@
             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 @@
           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 @@
      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));
   }

Modified: trunk/boost/graph/fruchterman_reingold.hpp
==============================================================================
--- trunk/boost/graph/fruchterman_reingold.hpp	(original)
+++ trunk/boost/graph/fruchterman_reingold.hpp	2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
@@ -404,8 +404,7 @@
    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, 

Modified: trunk/boost/graph/neighbor_bfs.hpp
==============================================================================
--- trunk/boost/graph/neighbor_bfs.hpp	(original)
+++ trunk/boost/graph/neighbor_bfs.hpp	2012-04-16 19:17:12 EDT (Mon, 16 Apr 2012)
@@ -288,8 +288,7 @@
     // 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));
   }