lemon-main: comparison lemon/dfs.h

equal deleted inserted replaced

-:3a36b024931f
+:85f219bf17e3
 ///\name Named template parameters
 ///@{
 template <class T>
-struct DefPredMapTraits : public Traits {
+struct SetPredMapTraits : public Traits {
 typedef T PredMap;
 static PredMap *createPredMap(const Digraph &)
 {
 throw UninitializedParameter();
 }
 ///\ref PredMap type.
 ///
 ///\ref named-templ-param "Named parameter" for setting
 ///\ref PredMap type.
 template <class T>
-struct DefPredMap : public Dfs<Digraph, DefPredMapTraits<T> > {
+struct SetPredMap : public Dfs<Digraph, SetPredMapTraits<T> > {
-typedef Dfs<Digraph, DefPredMapTraits<T> > Create;
+typedef Dfs<Digraph, SetPredMapTraits<T> > Create;
 };
 template <class T>
-struct DefDistMapTraits : public Traits {
+struct SetDistMapTraits : public Traits {
 typedef T DistMap;
 static DistMap *createDistMap(const Digraph &)
 {
 throw UninitializedParameter();
 }
 ///\ref DistMap type.
 ///
 ///\ref named-templ-param "Named parameter" for setting
 ///\ref DistMap type.
 template <class T>
-struct DefDistMap : public Dfs< Digraph, DefDistMapTraits<T> > {
+struct SetDistMap : public Dfs< Digraph, SetDistMapTraits<T> > {
-typedef Dfs<Digraph, DefDistMapTraits<T> > Create;
+typedef Dfs<Digraph, SetDistMapTraits<T> > Create;
 };
 template <class T>
-struct DefReachedMapTraits : public Traits {
+struct SetReachedMapTraits : public Traits {
 typedef T ReachedMap;
 static ReachedMap *createReachedMap(const Digraph &)
 {
 throw UninitializedParameter();
 }
 ///\ref ReachedMap type.
 ///
 ///\ref named-templ-param "Named parameter" for setting
 ///\ref ReachedMap type.
 template <class T>
-struct DefReachedMap : public Dfs< Digraph, DefReachedMapTraits<T> > {
+struct SetReachedMap : public Dfs< Digraph, SetReachedMapTraits<T> > {
-typedef Dfs< Digraph, DefReachedMapTraits<T> > Create;
+typedef Dfs< Digraph, SetReachedMapTraits<T> > Create;
 };
 template <class T>
-struct DefProcessedMapTraits : public Traits {
+struct SetProcessedMapTraits : public Traits {
 typedef T ProcessedMap;
 static ProcessedMap *createProcessedMap(const Digraph &)
 {
 throw UninitializedParameter();
 }
 ///\ref ProcessedMap type.
 ///
 ///\ref named-templ-param "Named parameter" for setting
 ///\ref ProcessedMap type.
 template <class T>
-struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
+struct SetProcessedMap : public Dfs< Digraph, SetProcessedMapTraits<T> > {
-typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
+typedef Dfs< Digraph, SetProcessedMapTraits<T> > Create;
 };
-struct DefDigraphProcessedMapTraits : public Traits {
+struct SetStandardProcessedMapTraits : public Traits {
 typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 static ProcessedMap *createProcessedMap(const Digraph &g)
 {
 return new ProcessedMap(g);
 }
 ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 ///
 ///\ref named-templ-param "Named parameter" for setting
 ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 ///If you don't set it explicitly, it will be automatically allocated.
-template <class T>
+struct SetStandardProcessedMap :
-struct DefProcessedMapToBeDefaultMap :
+public Dfs< Digraph, SetStandardProcessedMapTraits > {
-public Dfs< Digraph, DefDigraphProcessedMapTraits> {
+typedef Dfs< Digraph, SetStandardProcessedMapTraits > Create;
-typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
 };
 ///@}
 public:
 Base::_source=s;
 return *this;
 }
 template<class T>
-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.
 ///
 ///\ref named-templ-param "Named parameter"
 ///for setting \ref PredMap object.
 template<class T>
-DfsWizard<DefPredMapBase<T> > predMap(const T &t)
+DfsWizard<SetPredMapBase<T> > predMap(const T &t)
 {
 Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
-return DfsWizard<DefPredMapBase<T> >(*this);
+return DfsWizard<SetPredMapBase<T> >(*this);
 }
 template<class T>
-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.
 ///
 /// \ref named-templ-param "Named parameter"
 ///for setting \ref ReachedMap object.
 template<class T>
-DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+DfsWizard<SetReachedMapBase<T> > reachedMap(const T &t)
 {
 Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
-return DfsWizard<DefReachedMapBase<T> >(*this);
+return DfsWizard<SetReachedMapBase<T> >(*this);
 }
 template<class T>
-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.
 ///
 /// \ref named-templ-param "Named parameter"
 ///for setting \ref ProcessedMap object.
 template<class T>
-DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+DfsWizard<SetProcessedMapBase<T> > processedMap(const T &t)
 {
 Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
-return DfsWizard<DefProcessedMapBase<T> >(*this);
+return DfsWizard<SetProcessedMapBase<T> >(*this);
 }
 template<class T>
-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.
 ///
 ///\ref named-templ-param "Named parameter"
 ///for setting \ref DistMap object.
 template<class T>
-DfsWizard<DefDistMapBase<T> > distMap(const T &t)
+DfsWizard<SetDistMapBase<T> > distMap(const T &t)
 {
 Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
-return DfsWizard<DefDistMapBase<T> >(*this);
+return DfsWizard<SetDistMapBase<T> >(*this);
 }
 };
 ///Function type interface for Dfs algorithm.
 /// \name Named template parameters
 ///@{
 template <class T>
-struct DefReachedMapTraits : public Traits {
+struct SetReachedMapTraits : public Traits {
 typedef T ReachedMap;
 static ReachedMap *createReachedMap(const Digraph &digraph) {
 throw UninitializedParameter();
 }
 };
 /// \brief \ref named-templ-param "Named parameter" for setting
 /// ReachedMap type.
 ///
 /// \ref named-templ-param "Named parameter" for setting ReachedMap type.
 template <class T>
-struct DefReachedMap : public DfsVisit< Digraph, Visitor,
+struct SetReachedMap : public DfsVisit< Digraph, Visitor,
-DefReachedMapTraits<T> > {
+SetReachedMapTraits<T> > {
-typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
+typedef DfsVisit< Digraph, Visitor, SetReachedMapTraits<T> > Create;
 };
 ///@}
 public:

changeset 257	8d76a7bf9961
parent 247	f1158744a112
child 258	0310c8984732