[Boost-commit] svn:boost r77737 - trunk/boost/graph

Subject: [Boost-commit] svn:boost r77737 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2012-04-03 01:50:09

Author: jewillco
Date: 2012-04-03 01:50:09 EDT (Tue, 03 Apr 2012)
New Revision: 77737
URL: http://svn.boost.org/trac/boost/changeset/77737

Log:
Starting on converting to Boost.Parameter; not finished yet because of interaction with PBGL
Text files modified: 
   trunk/boost/graph/breadth_first_search.hpp |    47 +++++++++++++++++++++++++++++++++++++++ 
   1 files changed, 46 insertions(+), 1 deletions(-)

Modified: trunk/boost/graph/breadth_first_search.hpp
==============================================================================
--- trunk/boost/graph/breadth_first_search.hpp	(original)
+++ trunk/boost/graph/breadth_first_search.hpp	2012-04-03 01:50:09 EDT (Tue, 03 Apr 2012)
@@ -322,7 +322,7 @@
 
   } // namespace detail
 
-
+#if 1
   // Named Parameter Variant
   template <class VertexListGraph, class P, class T, class R>
   void breadth_first_search
@@ -339,6 +339,7 @@
     detail::bfs_dispatch<C>::apply(ng, s, params,
                                    get_param(params, vertex_color));
   }
+#endif
 
 
   // This version does not initialize colors, user has to.
@@ -370,6 +371,50 @@
        );
   }
 
+  namespace graph {
+    namespace detail {
+      template <typename Graph, typename Source, typename ArgPack>
+      struct breadth_first_search_impl {
+        typedef void result_type;
+        void operator()(const Graph& g, const Source& source, const ArgPack& arg_pack) {
+          using namespace boost::graph::keywords;
+          typename boost::graph_traits<Graph>::vertex_descriptor sources[1] = {source};
+          boost::queue<typename boost::graph_traits<Graph>::vertex_descriptor> Q;
+          boost::breadth_first_search(g,
+                                      &sources[0],
+                                      &sources[1], 
+                                      boost::unwrap_ref(arg_pack[_buffer | boost::ref(Q)]),
+                                      arg_pack[_visitor | make_bfs_visitor(null_visitor())],
+                                      boost::detail::make_color_map_from_arg_pack(g, arg_pack));
+        }
+      };
+    }
+    BOOST_GRAPH_MAKE_FORWARDING_FUNCTION(breadth_first_search, 2, 4)
+  }
+
+#if 0
+  // Named Parameter Variant
+  template <class VertexListGraph, class P, class T, class R>
+  void
+  breadth_first_search(const VertexListGraph& g,
+                       typename graph_traits<VertexListGraph>::vertex_descriptor s,
+                       const bgl_named_params<P, T, R>& params)
+  {
+    typedef bgl_named_params<P, T, R> params_type;
+    BOOST_GRAPH_DECLARE_CONVERTED_PARAMETERS(params_type, params)
+    boost::graph::breadth_first_search_with_named_params(g, s, arg_pack);
+  }
+
+  template <class VertexListGraph, class P, class T, class R>
+  void
+  breadth_first_search(const VertexListGraph& g,
+                       typename graph_traits<VertexListGraph>::vertex_descriptor s)
+  {
+    BOOST_GRAPH_DECLARE_CONVERTED_PARAMETERS(no_named_parameters, no_named_parameters())
+    boost::graph::breadth_first_search_with_named_params(g, s, arg_pack);
+  }
+#endif
+
 } // namespace boost
 
 #ifdef BOOST_GRAPH_USE_MPI