# HG changeset patch # User deba # Date 1144056278 0 # Node ID d769d2eb4d5058f0cdc39cb85bc786495ffb58ce # Parent e00114f165f5ffc0e548a509ffbcef557e5c915d Naming convention fix diff -r e00114f165f5 -r d769d2eb4d50 lemon/prim.h --- a/lemon/prim.h Mon Apr 03 08:41:52 2006 +0000 +++ b/lemon/prim.h Mon Apr 03 09:24:38 2006 +0000 @@ -38,8 +38,8 @@ ///Default traits class of Prim class. ///\param GR Graph type. - ///\param LM Type of cost map. - template + ///\param CM Type of cost map. + template struct PrimDefaultTraits{ ///The graph type the algorithm runs on. typedef GR UGraph; @@ -47,9 +47,9 @@ ///The type of the map that stores the edge costs. ///It must meet the \ref concept::ReadMap "ReadMap" concept. - typedef LM CostMap; + typedef CM CostMap; //The type of the cost of the edges. - typedef typename LM::Value Value; + typedef typename CM::Value Value; /// The cross reference type used by heap. /// The cross reference type used by heap. @@ -70,7 +70,7 @@ /// ///\sa BinHeap ///\sa Prim - typedef BinHeap > Heap; static Heap *createHeap(HeapCrossRef& _ref){ @@ -152,18 +152,18 @@ ///is \ref ListUGraph. The value of GR is not used directly by ///Prim, it is only passed to \ref PrimDefaultTraits. /// - ///\param LM This read-only UEdgeMap determines the costs of the + ///\param CM This read-only UEdgeMap determines the costs of the ///edges. It is read once for each edge, so the map may involve in ///relatively time consuming process to compute the edge cost if ///it is necessary. The default map type is \ref ///concept::UGraph::UEdgeMap "UGraph::UEdgeMap". The value - ///of LM is not used directly by Prim, it is only passed to \ref + ///of CM is not used directly by Prim, it is only passed to \ref ///PrimDefaultTraits. /// ///\param TR Traits class to set ///various data types used by the algorithm. The default traits ///class is \ref PrimDefaultTraits - ///"PrimDefaultTraits". See \ref + ///"PrimDefaultTraits". See \ref ///PrimDefaultTraits for the documentation of a Prim traits ///class. /// @@ -171,21 +171,20 @@ #ifdef DOXYGEN template #else template , - typename TR=PrimDefaultTraits > + typename CM=typename GR::template UEdgeMap, + typename TR=PrimDefaultTraits > #endif class Prim { public: - /** - * \brief \ref Exception for uninitialized parameters. - * - * This error represents problems in the initialization - * of the parameters of the algorithms. - */ + + /// \brief \ref Exception for uninitialized parameters. + /// + /// This error represents problems in the initialization + /// of the parameters of the algorithms. class UninitializedParameter : public lemon::UninitializedParameter { public: virtual const char* exceptionName() const {