diff -r f0b89f242745 -r 8d76a7bf9961 lemon/bfs.h --- a/lemon/bfs.h Mon Aug 18 20:33:11 2008 +0200 +++ b/lemon/bfs.h Mon Sep 01 22:00:40 2008 +0200 @@ -230,7 +230,7 @@ ///@{ template - struct DefPredMapTraits : public Traits { + struct SetPredMapTraits : public Traits { typedef T PredMap; static PredMap *createPredMap(const Digraph &) { @@ -243,12 +243,12 @@ ///\ref named-templ-param "Named parameter" for setting ///\ref PredMap type. template - struct DefPredMap : public Bfs< Digraph, DefPredMapTraits > { - typedef Bfs< Digraph, DefPredMapTraits > Create; + struct SetPredMap : public Bfs< Digraph, SetPredMapTraits > { + typedef Bfs< Digraph, SetPredMapTraits > Create; }; template - struct DefDistMapTraits : public Traits { + struct SetDistMapTraits : public Traits { typedef T DistMap; static DistMap *createDistMap(const Digraph &) { @@ -261,12 +261,12 @@ ///\ref named-templ-param "Named parameter" for setting ///\ref DistMap type. template - struct DefDistMap : public Bfs< Digraph, DefDistMapTraits > { - typedef Bfs< Digraph, DefDistMapTraits > Create; + struct SetDistMap : public Bfs< Digraph, SetDistMapTraits > { + typedef Bfs< Digraph, SetDistMapTraits > Create; }; template - struct DefReachedMapTraits : public Traits { + struct SetReachedMapTraits : public Traits { typedef T ReachedMap; static ReachedMap *createReachedMap(const Digraph &) { @@ -279,12 +279,12 @@ ///\ref named-templ-param "Named parameter" for setting ///\ref ReachedMap type. template - struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits > { - typedef Bfs< Digraph, DefReachedMapTraits > Create; + struct SetReachedMap : public Bfs< Digraph, SetReachedMapTraits > { + typedef Bfs< Digraph, SetReachedMapTraits > Create; }; template - struct DefProcessedMapTraits : public Traits { + struct SetProcessedMapTraits : public Traits { typedef T ProcessedMap; static ProcessedMap *createProcessedMap(const Digraph &) { @@ -297,11 +297,11 @@ ///\ref named-templ-param "Named parameter" for setting ///\ref ProcessedMap type. template - struct DefProcessedMap : public Bfs< Digraph, DefProcessedMapTraits > { - typedef Bfs< Digraph, DefProcessedMapTraits > Create; + struct SetProcessedMap : public Bfs< Digraph, SetProcessedMapTraits > { + typedef Bfs< Digraph, SetProcessedMapTraits > Create; }; - struct DefDigraphProcessedMapTraits : public Traits { + struct SetStandardProcessedMapTraits : public Traits { typedef typename Digraph::template NodeMap ProcessedMap; static ProcessedMap *createProcessedMap(const Digraph &g) { @@ -314,10 +314,9 @@ ///\ref named-templ-param "Named parameter" for setting ///\ref ProcessedMap type to be Digraph::NodeMap. ///If you don't set it explicitly, it will be automatically allocated. - template - struct DefProcessedMapToBeDefaultMap : - public Bfs< Digraph, DefDigraphProcessedMapTraits> { - typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create; + struct SetStandardProcessedMap : + public Bfs< Digraph, SetStandardProcessedMapTraits > { + typedef Bfs< Digraph, SetStandardProcessedMapTraits > Create; }; ///@} @@ -1065,10 +1064,10 @@ } template - struct DefPredMapBase : public Base { + struct SetPredMapBase : public Base { typedef T PredMap; static PredMap *createPredMap(const Digraph &) { return 0; }; - DefPredMapBase(const TR &b) : TR(b) {} + SetPredMapBase(const TR &b) : TR(b) {} }; ///\brief \ref named-templ-param "Named parameter" ///for setting \ref PredMap object. @@ -1076,17 +1075,17 @@ /// \ref named-templ-param "Named parameter" ///for setting \ref PredMap object. template - BfsWizard > predMap(const T &t) + BfsWizard > predMap(const T &t) { Base::_pred=reinterpret_cast(const_cast(&t)); - return BfsWizard >(*this); + return BfsWizard >(*this); } template - struct DefReachedMapBase : public Base { + struct SetReachedMapBase : public Base { typedef T ReachedMap; static ReachedMap *createReachedMap(const Digraph &) { return 0; }; - DefReachedMapBase(const TR &b) : TR(b) {} + SetReachedMapBase(const TR &b) : TR(b) {} }; ///\brief \ref named-templ-param "Named parameter" ///for setting \ref ReachedMap object. @@ -1094,17 +1093,17 @@ /// \ref named-templ-param "Named parameter" ///for setting \ref ReachedMap object. template - BfsWizard > reachedMap(const T &t) + BfsWizard > reachedMap(const T &t) { Base::_reached=reinterpret_cast(const_cast(&t)); - return BfsWizard >(*this); + return BfsWizard >(*this); } template - struct DefProcessedMapBase : public Base { + struct SetProcessedMapBase : public Base { typedef T ProcessedMap; static ProcessedMap *createProcessedMap(const Digraph &) { return 0; }; - DefProcessedMapBase(const TR &b) : TR(b) {} + SetProcessedMapBase(const TR &b) : TR(b) {} }; ///\brief \ref named-templ-param "Named parameter" ///for setting \ref ProcessedMap object. @@ -1112,17 +1111,17 @@ /// \ref named-templ-param "Named parameter" ///for setting \ref ProcessedMap object. template - BfsWizard > processedMap(const T &t) + BfsWizard > processedMap(const T &t) { Base::_processed=reinterpret_cast(const_cast(&t)); - return BfsWizard >(*this); + return BfsWizard >(*this); } template - struct DefDistMapBase : public Base { + struct SetDistMapBase : public Base { typedef T DistMap; static DistMap *createDistMap(const Digraph &) { return 0; }; - DefDistMapBase(const TR &b) : TR(b) {} + SetDistMapBase(const TR &b) : TR(b) {} }; ///\brief \ref named-templ-param "Named parameter" ///for setting \ref DistMap object. @@ -1130,10 +1129,10 @@ /// \ref named-templ-param "Named parameter" ///for setting \ref DistMap object. template - BfsWizard > distMap(const T &t) + BfsWizard > distMap(const T &t) { Base::_dist=reinterpret_cast(const_cast(&t)); - return BfsWizard >(*this); + return BfsWizard >(*this); } }; @@ -1349,7 +1348,7 @@ ///@{ template - struct DefReachedMapTraits : public Traits { + struct SetReachedMapTraits : public Traits { typedef T ReachedMap; static ReachedMap *createReachedMap(const Digraph &digraph) { throw UninitializedParameter(); @@ -1360,9 +1359,9 @@ /// /// \ref named-templ-param "Named parameter" for setting ReachedMap type. template - struct DefReachedMap : public BfsVisit< Digraph, Visitor, - DefReachedMapTraits > { - typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits > Create; + struct SetReachedMap : public BfsVisit< Digraph, Visitor, + SetReachedMapTraits > { + typedef BfsVisit< Digraph, Visitor, SetReachedMapTraits > Create; }; ///@}