From 1078af6c86b67da88183080869da8fb24666ef4f Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Mon, 23 Apr 2001 19:00:20 +0000 Subject: [PATCH] simplified code [SVN r9933] --- include/boost/graph/topological_sort.hpp | 41 +++++------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/include/boost/graph/topological_sort.hpp b/include/boost/graph/topological_sort.hpp index cba323f4..c846a04d 100644 --- a/include/boost/graph/topological_sort.hpp +++ b/include/boost/graph/topological_sort.hpp @@ -45,11 +45,11 @@ namespace boost { // front_insert_iterator, the recorded order is the topological // order. // - template - struct topo_sort_visitor : public DFSVisitor + template + struct topo_sort_visitor : public dfs_visitor<> { - topo_sort_visitor(OutputIterator _iter, DFSVisitor v) - : DFSVisitor(v), m_iter(_iter) { } + topo_sort_visitor(OutputIterator _iter) + : m_iter(_iter) { } template void finish_vertex(Vertex& u, Graph&) { *m_iter++ = u; } @@ -66,44 +66,19 @@ namespace boost { // consists mainly of a call to depth-first search. // - namespace detail { - template - inline void - topo_sort_helper(Graph& G, OutputIterator result, Color color, - DFSVisitor visit) - { - typedef topo_sort_visitor TopoVisitor; - depth_first_search - (G, visitor(TopoVisitor(result, visit)). color_map(color)); - } - } // namespace detail - template void topological_sort(VertexListGraph& g, OutputIterator result, const bgl_named_params& params) { - // ColorMap default - typename graph_traits::vertices_size_type - n = is_default_param(get_param(params, vertex_color)) ? - num_vertices(g) : 0; - std::vector color_map(n); - detail::topo_sort_helper - (g, result, - choose_param(get_param(params, vertex_color), - make_iterator_property_map - (color_map.begin(), - choose_pmap(get_param(params, vertex_index), - g, vertex_index))), - choose_param(get_param(params, graph_visitor), - make_dfs_visitor(null_visitor())) - ); + typedef topo_sort_visitor TopoVisitor; + depth_first_search(g, params.visitor(TopoVisitor(result))); } template - void topological_sort(VertexListGraph& G, OutputIterator result) + void topological_sort(VertexListGraph& g, OutputIterator result) { - return topological_sort(G, result, bgl_named_params('x')); + return topological_sort(g, result, bgl_named_params(0)); } } // namespace boost