1.1 --- a/lemon/kruskal.h Mon Jan 12 23:11:39 2009 +0100
1.2 +++ b/lemon/kruskal.h Thu Nov 05 15:48:01 2009 +0100
1.3 @@ -248,11 +248,11 @@
1.4
1.5 /// \ingroup spantree
1.6 ///
1.7 - /// \brief Kruskal algorithm to find a minimum cost spanning tree of
1.8 + /// \brief Kruskal's algorithm for finding a minimum cost spanning tree of
1.9 /// a graph.
1.10 ///
1.11 /// This function runs Kruskal's algorithm to find a minimum cost
1.12 - /// spanning tree.
1.13 + /// spanning tree of a graph.
1.14 /// Due to some C++ hacking, it accepts various input and output types.
1.15 ///
1.16 /// \param g The graph the algorithm runs on.
1.17 @@ -264,17 +264,17 @@
1.18 /// \param in This object is used to describe the arc/edge costs.
1.19 /// It can be one of the following choices.
1.20 /// - An STL compatible 'Forward Container' with
1.21 - /// <tt>std::pair<GR::Arc,X></tt> or
1.22 - /// <tt>std::pair<GR::Edge,X></tt> as its <tt>value_type</tt>, where
1.23 - /// \c X is the type of the costs. The pairs indicates the arcs/edges
1.24 + /// <tt>std::pair<GR::Arc,C></tt> or
1.25 + /// <tt>std::pair<GR::Edge,C></tt> as its <tt>value_type</tt>, where
1.26 + /// \c C is the type of the costs. The pairs indicates the arcs/edges
1.27 /// along with the assigned cost. <em>They must be in a
1.28 /// cost-ascending order.</em>
1.29 /// - Any readable arc/edge map. The values of the map indicate the
1.30 /// arc/edge costs.
1.31 ///
1.32 /// \retval out Here we also have a choice.
1.33 - /// - It can be a writable \c bool arc/edge map. After running the
1.34 - /// algorithm it will contain the found minimum cost spanning
1.35 + /// - It can be a writable arc/edge map with \c bool value type. After
1.36 + /// running the algorithm it will contain the found minimum cost spanning
1.37 /// tree: the value of an arc/edge will be set to \c true if it belongs
1.38 /// to the tree, otherwise it will be set to \c false. The value of
1.39 /// each arc/edge will be set exactly once.
1.40 @@ -301,8 +301,8 @@
1.41 /// forest is calculated instead of a spanning tree.
1.42
1.43 #ifdef DOXYGEN
1.44 - template <class Graph, class In, class Out>
1.45 - Value kruskal(GR const& g, const In& in, Out& out)
1.46 + template <typename Graph, typename In, typename Out>
1.47 + Value kruskal(const Graph& g, const In& in, Out& out)
1.48 #else
1.49 template <class Graph, class In, class Out>
1.50 inline typename _kruskal_bits::KruskalValueSelector<In>::Value
1.51 @@ -314,8 +314,6 @@
1.52 }
1.53
1.54
1.55 -
1.56 -
1.57 template <class Graph, class In, class Out>
1.58 inline typename _kruskal_bits::KruskalValueSelector<In>::Value
1.59 kruskal(const Graph& graph, const In& in, const Out& out)