1.1 --- a/lemon/bfs.h Mon Aug 18 20:33:11 2008 +0200
1.2 +++ b/lemon/bfs.h Mon Sep 01 22:00:40 2008 +0200
1.3 @@ -230,7 +230,7 @@
1.4 ///@{
1.5
1.6 template <class T>
1.7 - struct DefPredMapTraits : public Traits {
1.8 + struct SetPredMapTraits : public Traits {
1.9 typedef T PredMap;
1.10 static PredMap *createPredMap(const Digraph &)
1.11 {
1.12 @@ -243,12 +243,12 @@
1.13 ///\ref named-templ-param "Named parameter" for setting
1.14 ///\ref PredMap type.
1.15 template <class T>
1.16 - struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > {
1.17 - typedef Bfs< Digraph, DefPredMapTraits<T> > Create;
1.18 + struct SetPredMap : public Bfs< Digraph, SetPredMapTraits<T> > {
1.19 + typedef Bfs< Digraph, SetPredMapTraits<T> > Create;
1.20 };
1.21
1.22 template <class T>
1.23 - struct DefDistMapTraits : public Traits {
1.24 + struct SetDistMapTraits : public Traits {
1.25 typedef T DistMap;
1.26 static DistMap *createDistMap(const Digraph &)
1.27 {
1.28 @@ -261,12 +261,12 @@
1.29 ///\ref named-templ-param "Named parameter" for setting
1.30 ///\ref DistMap type.
1.31 template <class T>
1.32 - struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
1.33 - typedef Bfs< Digraph, DefDistMapTraits<T> > Create;
1.34 + struct SetDistMap : public Bfs< Digraph, SetDistMapTraits<T> > {
1.35 + typedef Bfs< Digraph, SetDistMapTraits<T> > Create;
1.36 };
1.37
1.38 template <class T>
1.39 - struct DefReachedMapTraits : public Traits {
1.40 + struct SetReachedMapTraits : public Traits {
1.41 typedef T ReachedMap;
1.42 static ReachedMap *createReachedMap(const Digraph &)
1.43 {
1.44 @@ -279,12 +279,12 @@
1.45 ///\ref named-templ-param "Named parameter" for setting
1.46 ///\ref ReachedMap type.
1.47 template <class T>
1.48 - struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
1.49 - typedef Bfs< Digraph, DefReachedMapTraits<T> > Create;
1.50 + struct SetReachedMap : public Bfs< Digraph, SetReachedMapTraits<T> > {
1.51 + typedef Bfs< Digraph, SetReachedMapTraits<T> > Create;
1.52 };
1.53
1.54 template <class T>
1.55 - struct DefProcessedMapTraits : public Traits {
1.56 + struct SetProcessedMapTraits : public Traits {
1.57 typedef T ProcessedMap;
1.58 static ProcessedMap *createProcessedMap(const Digraph &)
1.59 {
1.60 @@ -297,11 +297,11 @@
1.61 ///\ref named-templ-param "Named parameter" for setting
1.62 ///\ref ProcessedMap type.
1.63 template <class T>
1.64 - struct DefProcessedMap : public Bfs< Digraph, DefProcessedMapTraits<T> > {
1.65 - typedef Bfs< Digraph, DefProcessedMapTraits<T> > Create;
1.66 + struct SetProcessedMap : public Bfs< Digraph, SetProcessedMapTraits<T> > {
1.67 + typedef Bfs< Digraph, SetProcessedMapTraits<T> > Create;
1.68 };
1.69
1.70 - struct DefDigraphProcessedMapTraits : public Traits {
1.71 + struct SetStandardProcessedMapTraits : public Traits {
1.72 typedef typename Digraph::template NodeMap<bool> ProcessedMap;
1.73 static ProcessedMap *createProcessedMap(const Digraph &g)
1.74 {
1.75 @@ -314,10 +314,9 @@
1.76 ///\ref named-templ-param "Named parameter" for setting
1.77 ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
1.78 ///If you don't set it explicitly, it will be automatically allocated.
1.79 - template <class T>
1.80 - struct DefProcessedMapToBeDefaultMap :
1.81 - public Bfs< Digraph, DefDigraphProcessedMapTraits> {
1.82 - typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create;
1.83 + struct SetStandardProcessedMap :
1.84 + public Bfs< Digraph, SetStandardProcessedMapTraits > {
1.85 + typedef Bfs< Digraph, SetStandardProcessedMapTraits > Create;
1.86 };
1.87
1.88 ///@}
1.89 @@ -1065,10 +1064,10 @@
1.90 }
1.91
1.92 template<class T>
1.93 - struct DefPredMapBase : public Base {
1.94 + struct SetPredMapBase : public Base {
1.95 typedef T PredMap;
1.96 static PredMap *createPredMap(const Digraph &) { return 0; };
1.97 - DefPredMapBase(const TR &b) : TR(b) {}
1.98 + SetPredMapBase(const TR &b) : TR(b) {}
1.99 };
1.100 ///\brief \ref named-templ-param "Named parameter"
1.101 ///for setting \ref PredMap object.
1.102 @@ -1076,17 +1075,17 @@
1.103 /// \ref named-templ-param "Named parameter"
1.104 ///for setting \ref PredMap object.
1.105 template<class T>
1.106 - BfsWizard<DefPredMapBase<T> > predMap(const T &t)
1.107 + BfsWizard<SetPredMapBase<T> > predMap(const T &t)
1.108 {
1.109 Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
1.110 - return BfsWizard<DefPredMapBase<T> >(*this);
1.111 + return BfsWizard<SetPredMapBase<T> >(*this);
1.112 }
1.113
1.114 template<class T>
1.115 - struct DefReachedMapBase : public Base {
1.116 + struct SetReachedMapBase : public Base {
1.117 typedef T ReachedMap;
1.118 static ReachedMap *createReachedMap(const Digraph &) { return 0; };
1.119 - DefReachedMapBase(const TR &b) : TR(b) {}
1.120 + SetReachedMapBase(const TR &b) : TR(b) {}
1.121 };
1.122 ///\brief \ref named-templ-param "Named parameter"
1.123 ///for setting \ref ReachedMap object.
1.124 @@ -1094,17 +1093,17 @@
1.125 /// \ref named-templ-param "Named parameter"
1.126 ///for setting \ref ReachedMap object.
1.127 template<class T>
1.128 - BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
1.129 + BfsWizard<SetReachedMapBase<T> > reachedMap(const T &t)
1.130 {
1.131 Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
1.132 - return BfsWizard<DefReachedMapBase<T> >(*this);
1.133 + return BfsWizard<SetReachedMapBase<T> >(*this);
1.134 }
1.135
1.136 template<class T>
1.137 - struct DefProcessedMapBase : public Base {
1.138 + struct SetProcessedMapBase : public Base {
1.139 typedef T ProcessedMap;
1.140 static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
1.141 - DefProcessedMapBase(const TR &b) : TR(b) {}
1.142 + SetProcessedMapBase(const TR &b) : TR(b) {}
1.143 };
1.144 ///\brief \ref named-templ-param "Named parameter"
1.145 ///for setting \ref ProcessedMap object.
1.146 @@ -1112,17 +1111,17 @@
1.147 /// \ref named-templ-param "Named parameter"
1.148 ///for setting \ref ProcessedMap object.
1.149 template<class T>
1.150 - BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
1.151 + BfsWizard<SetProcessedMapBase<T> > processedMap(const T &t)
1.152 {
1.153 Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
1.154 - return BfsWizard<DefProcessedMapBase<T> >(*this);
1.155 + return BfsWizard<SetProcessedMapBase<T> >(*this);
1.156 }
1.157
1.158 template<class T>
1.159 - struct DefDistMapBase : public Base {
1.160 + struct SetDistMapBase : public Base {
1.161 typedef T DistMap;
1.162 static DistMap *createDistMap(const Digraph &) { return 0; };
1.163 - DefDistMapBase(const TR &b) : TR(b) {}
1.164 + SetDistMapBase(const TR &b) : TR(b) {}
1.165 };
1.166 ///\brief \ref named-templ-param "Named parameter"
1.167 ///for setting \ref DistMap object.
1.168 @@ -1130,10 +1129,10 @@
1.169 /// \ref named-templ-param "Named parameter"
1.170 ///for setting \ref DistMap object.
1.171 template<class T>
1.172 - BfsWizard<DefDistMapBase<T> > distMap(const T &t)
1.173 + BfsWizard<SetDistMapBase<T> > distMap(const T &t)
1.174 {
1.175 Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
1.176 - return BfsWizard<DefDistMapBase<T> >(*this);
1.177 + return BfsWizard<SetDistMapBase<T> >(*this);
1.178 }
1.179
1.180 };
1.181 @@ -1349,7 +1348,7 @@
1.182
1.183 ///@{
1.184 template <class T>
1.185 - struct DefReachedMapTraits : public Traits {
1.186 + struct SetReachedMapTraits : public Traits {
1.187 typedef T ReachedMap;
1.188 static ReachedMap *createReachedMap(const Digraph &digraph) {
1.189 throw UninitializedParameter();
1.190 @@ -1360,9 +1359,9 @@
1.191 ///
1.192 /// \ref named-templ-param "Named parameter" for setting ReachedMap type.
1.193 template <class T>
1.194 - struct DefReachedMap : public BfsVisit< Digraph, Visitor,
1.195 - DefReachedMapTraits<T> > {
1.196 - typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
1.197 + struct SetReachedMap : public BfsVisit< Digraph, Visitor,
1.198 + SetReachedMapTraits<T> > {
1.199 + typedef BfsVisit< Digraph, Visitor, SetReachedMapTraits<T> > Create;
1.200 };
1.201 ///@}
1.202
2.1 --- a/lemon/dfs.h Mon Aug 18 20:33:11 2008 +0200
2.2 +++ b/lemon/dfs.h Mon Sep 01 22:00:40 2008 +0200
2.3 @@ -230,7 +230,7 @@
2.4 ///@{
2.5
2.6 template <class T>
2.7 - struct DefPredMapTraits : public Traits {
2.8 + struct SetPredMapTraits : public Traits {
2.9 typedef T PredMap;
2.10 static PredMap *createPredMap(const Digraph &)
2.11 {
2.12 @@ -243,12 +243,12 @@
2.13 ///\ref named-templ-param "Named parameter" for setting
2.14 ///\ref PredMap type.
2.15 template <class T>
2.16 - struct DefPredMap : public Dfs<Digraph, DefPredMapTraits<T> > {
2.17 - typedef Dfs<Digraph, DefPredMapTraits<T> > Create;
2.18 + struct SetPredMap : public Dfs<Digraph, SetPredMapTraits<T> > {
2.19 + typedef Dfs<Digraph, SetPredMapTraits<T> > Create;
2.20 };
2.21
2.22 template <class T>
2.23 - struct DefDistMapTraits : public Traits {
2.24 + struct SetDistMapTraits : public Traits {
2.25 typedef T DistMap;
2.26 static DistMap *createDistMap(const Digraph &)
2.27 {
2.28 @@ -261,12 +261,12 @@
2.29 ///\ref named-templ-param "Named parameter" for setting
2.30 ///\ref DistMap type.
2.31 template <class T>
2.32 - struct DefDistMap : public Dfs< Digraph, DefDistMapTraits<T> > {
2.33 - typedef Dfs<Digraph, DefDistMapTraits<T> > Create;
2.34 + struct SetDistMap : public Dfs< Digraph, SetDistMapTraits<T> > {
2.35 + typedef Dfs<Digraph, SetDistMapTraits<T> > Create;
2.36 };
2.37
2.38 template <class T>
2.39 - struct DefReachedMapTraits : public Traits {
2.40 + struct SetReachedMapTraits : public Traits {
2.41 typedef T ReachedMap;
2.42 static ReachedMap *createReachedMap(const Digraph &)
2.43 {
2.44 @@ -279,12 +279,12 @@
2.45 ///\ref named-templ-param "Named parameter" for setting
2.46 ///\ref ReachedMap type.
2.47 template <class T>
2.48 - struct DefReachedMap : public Dfs< Digraph, DefReachedMapTraits<T> > {
2.49 - typedef Dfs< Digraph, DefReachedMapTraits<T> > Create;
2.50 + struct SetReachedMap : public Dfs< Digraph, SetReachedMapTraits<T> > {
2.51 + typedef Dfs< Digraph, SetReachedMapTraits<T> > Create;
2.52 };
2.53
2.54 template <class T>
2.55 - struct DefProcessedMapTraits : public Traits {
2.56 + struct SetProcessedMapTraits : public Traits {
2.57 typedef T ProcessedMap;
2.58 static ProcessedMap *createProcessedMap(const Digraph &)
2.59 {
2.60 @@ -297,11 +297,11 @@
2.61 ///\ref named-templ-param "Named parameter" for setting
2.62 ///\ref ProcessedMap type.
2.63 template <class T>
2.64 - struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
2.65 - typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
2.66 + struct SetProcessedMap : public Dfs< Digraph, SetProcessedMapTraits<T> > {
2.67 + typedef Dfs< Digraph, SetProcessedMapTraits<T> > Create;
2.68 };
2.69
2.70 - struct DefDigraphProcessedMapTraits : public Traits {
2.71 + struct SetStandardProcessedMapTraits : public Traits {
2.72 typedef typename Digraph::template NodeMap<bool> ProcessedMap;
2.73 static ProcessedMap *createProcessedMap(const Digraph &g)
2.74 {
2.75 @@ -314,10 +314,9 @@
2.76 ///\ref named-templ-param "Named parameter" for setting
2.77 ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
2.78 ///If you don't set it explicitly, it will be automatically allocated.
2.79 - template <class T>
2.80 - struct DefProcessedMapToBeDefaultMap :
2.81 - public Dfs< Digraph, DefDigraphProcessedMapTraits> {
2.82 - typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
2.83 + struct SetStandardProcessedMap :
2.84 + public Dfs< Digraph, SetStandardProcessedMapTraits > {
2.85 + typedef Dfs< Digraph, SetStandardProcessedMapTraits > Create;
2.86 };
2.87
2.88 ///@}
2.89 @@ -1000,10 +999,10 @@
2.90 }
2.91
2.92 template<class T>
2.93 - struct DefPredMapBase : public Base {
2.94 + struct SetPredMapBase : public Base {
2.95 typedef T PredMap;
2.96 static PredMap *createPredMap(const Digraph &) { return 0; };
2.97 - DefPredMapBase(const TR &b) : TR(b) {}
2.98 + SetPredMapBase(const TR &b) : TR(b) {}
2.99 };
2.100 ///\brief \ref named-templ-param "Named parameter"
2.101 ///for setting \ref PredMap object.
2.102 @@ -1011,17 +1010,17 @@
2.103 ///\ref named-templ-param "Named parameter"
2.104 ///for setting \ref PredMap object.
2.105 template<class T>
2.106 - DfsWizard<DefPredMapBase<T> > predMap(const T &t)
2.107 + DfsWizard<SetPredMapBase<T> > predMap(const T &t)
2.108 {
2.109 Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
2.110 - return DfsWizard<DefPredMapBase<T> >(*this);
2.111 + return DfsWizard<SetPredMapBase<T> >(*this);
2.112 }
2.113
2.114 template<class T>
2.115 - struct DefReachedMapBase : public Base {
2.116 + struct SetReachedMapBase : public Base {
2.117 typedef T ReachedMap;
2.118 static ReachedMap *createReachedMap(const Digraph &) { return 0; };
2.119 - DefReachedMapBase(const TR &b) : TR(b) {}
2.120 + SetReachedMapBase(const TR &b) : TR(b) {}
2.121 };
2.122 ///\brief \ref named-templ-param "Named parameter"
2.123 ///for setting \ref ReachedMap object.
2.124 @@ -1029,17 +1028,17 @@
2.125 /// \ref named-templ-param "Named parameter"
2.126 ///for setting \ref ReachedMap object.
2.127 template<class T>
2.128 - DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
2.129 + DfsWizard<SetReachedMapBase<T> > reachedMap(const T &t)
2.130 {
2.131 Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
2.132 - return DfsWizard<DefReachedMapBase<T> >(*this);
2.133 + return DfsWizard<SetReachedMapBase<T> >(*this);
2.134 }
2.135
2.136 template<class T>
2.137 - struct DefProcessedMapBase : public Base {
2.138 + struct SetProcessedMapBase : public Base {
2.139 typedef T ProcessedMap;
2.140 static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
2.141 - DefProcessedMapBase(const TR &b) : TR(b) {}
2.142 + SetProcessedMapBase(const TR &b) : TR(b) {}
2.143 };
2.144 ///\brief \ref named-templ-param "Named parameter"
2.145 ///for setting \ref ProcessedMap object.
2.146 @@ -1047,17 +1046,17 @@
2.147 /// \ref named-templ-param "Named parameter"
2.148 ///for setting \ref ProcessedMap object.
2.149 template<class T>
2.150 - DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
2.151 + DfsWizard<SetProcessedMapBase<T> > processedMap(const T &t)
2.152 {
2.153 Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
2.154 - return DfsWizard<DefProcessedMapBase<T> >(*this);
2.155 + return DfsWizard<SetProcessedMapBase<T> >(*this);
2.156 }
2.157
2.158 template<class T>
2.159 - struct DefDistMapBase : public Base {
2.160 + struct SetDistMapBase : public Base {
2.161 typedef T DistMap;
2.162 static DistMap *createDistMap(const Digraph &) { return 0; };
2.163 - DefDistMapBase(const TR &b) : TR(b) {}
2.164 + SetDistMapBase(const TR &b) : TR(b) {}
2.165 };
2.166 ///\brief \ref named-templ-param "Named parameter"
2.167 ///for setting \ref DistMap object.
2.168 @@ -1065,10 +1064,10 @@
2.169 ///\ref named-templ-param "Named parameter"
2.170 ///for setting \ref DistMap object.
2.171 template<class T>
2.172 - DfsWizard<DefDistMapBase<T> > distMap(const T &t)
2.173 + DfsWizard<SetDistMapBase<T> > distMap(const T &t)
2.174 {
2.175 Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
2.176 - return DfsWizard<DefDistMapBase<T> >(*this);
2.177 + return DfsWizard<SetDistMapBase<T> >(*this);
2.178 }
2.179
2.180 };
2.181 @@ -1296,7 +1295,7 @@
2.182
2.183 ///@{
2.184 template <class T>
2.185 - struct DefReachedMapTraits : public Traits {
2.186 + struct SetReachedMapTraits : public Traits {
2.187 typedef T ReachedMap;
2.188 static ReachedMap *createReachedMap(const Digraph &digraph) {
2.189 throw UninitializedParameter();
2.190 @@ -1307,9 +1306,9 @@
2.191 ///
2.192 /// \ref named-templ-param "Named parameter" for setting ReachedMap type.
2.193 template <class T>
2.194 - struct DefReachedMap : public DfsVisit< Digraph, Visitor,
2.195 - DefReachedMapTraits<T> > {
2.196 - typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
2.197 + struct SetReachedMap : public DfsVisit< Digraph, Visitor,
2.198 + SetReachedMapTraits<T> > {
2.199 + typedef DfsVisit< Digraph, Visitor, SetReachedMapTraits<T> > Create;
2.200 };
2.201 ///@}
2.202
3.1 --- a/lemon/dijkstra.h Mon Aug 18 20:33:11 2008 +0200
3.2 +++ b/lemon/dijkstra.h Mon Sep 01 22:00:40 2008 +0200
3.3 @@ -331,7 +331,7 @@
3.4 ///@{
3.5
3.6 template <class T>
3.7 - struct DefPredMapTraits : public Traits {
3.8 + struct SetPredMapTraits : public Traits {
3.9 typedef T PredMap;
3.10 static PredMap *createPredMap(const Digraph &)
3.11 {
3.12 @@ -344,13 +344,13 @@
3.13 ///\ref named-templ-param "Named parameter" for setting
3.14 ///\ref PredMap type.
3.15 template <class T>
3.16 - struct DefPredMap
3.17 - : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
3.18 - typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
3.19 + struct SetPredMap
3.20 + : public Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > {
3.21 + typedef Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > Create;
3.22 };
3.23
3.24 template <class T>
3.25 - struct DefDistMapTraits : public Traits {
3.26 + struct SetDistMapTraits : public Traits {
3.27 typedef T DistMap;
3.28 static DistMap *createDistMap(const Digraph &)
3.29 {
3.30 @@ -363,13 +363,13 @@
3.31 ///\ref named-templ-param "Named parameter" for setting
3.32 ///\ref DistMap type.
3.33 template <class T>
3.34 - struct DefDistMap
3.35 - : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
3.36 - typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
3.37 + struct SetDistMap
3.38 + : public Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > {
3.39 + typedef Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > Create;
3.40 };
3.41
3.42 template <class T>
3.43 - struct DefProcessedMapTraits : public Traits {
3.44 + struct SetProcessedMapTraits : public Traits {
3.45 typedef T ProcessedMap;
3.46 static ProcessedMap *createProcessedMap(const Digraph &)
3.47 {
3.48 @@ -382,12 +382,12 @@
3.49 ///\ref named-templ-param "Named parameter" for setting
3.50 ///\ref ProcessedMap type.
3.51 template <class T>
3.52 - struct DefProcessedMap
3.53 - : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
3.54 - typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
3.55 + struct SetProcessedMap
3.56 + : public Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > {
3.57 + typedef Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > Create;
3.58 };
3.59
3.60 - struct DefDigraphProcessedMapTraits : public Traits {
3.61 + struct SetStandardProcessedMapTraits : public Traits {
3.62 typedef typename Digraph::template NodeMap<bool> ProcessedMap;
3.63 static ProcessedMap *createProcessedMap(const Digraph &g)
3.64 {
3.65 @@ -400,15 +400,14 @@
3.66 ///\ref named-templ-param "Named parameter" for setting
3.67 ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
3.68 ///If you don't set it explicitly, it will be automatically allocated.
3.69 - template <class T>
3.70 - struct DefProcessedMapToBeDefaultMap
3.71 - : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
3.72 - typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
3.73 + struct SetStandardProcessedMap
3.74 + : public Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits > {
3.75 + typedef Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits >
3.76 Create;
3.77 };
3.78
3.79 template <class H, class CR>
3.80 - struct DefHeapTraits : public Traits {
3.81 + struct SetHeapTraits : public Traits {
3.82 typedef CR HeapCrossRef;
3.83 typedef H Heap;
3.84 static HeapCrossRef *createHeapCrossRef(const Digraph &) {
3.85 @@ -425,13 +424,13 @@
3.86 ///\ref named-templ-param "Named parameter" for setting heap and cross
3.87 ///reference type.
3.88 template <class H, class CR = typename Digraph::template NodeMap<int> >
3.89 - struct DefHeap
3.90 - : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
3.91 - typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
3.92 + struct SetHeap
3.93 + : public Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > {
3.94 + typedef Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > Create;
3.95 };
3.96
3.97 template <class H, class CR>
3.98 - struct DefStandardHeapTraits : public Traits {
3.99 + struct SetStandardHeapTraits : public Traits {
3.100 typedef CR HeapCrossRef;
3.101 typedef H Heap;
3.102 static HeapCrossRef *createHeapCrossRef(const Digraph &G) {
3.103 @@ -450,14 +449,14 @@
3.104 ///object if the cross reference's constructor waits for the digraph as
3.105 ///parameter and the heap's constructor waits for the cross reference.
3.106 template <class H, class CR = typename Digraph::template NodeMap<int> >
3.107 - struct DefStandardHeap
3.108 - : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
3.109 - typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
3.110 + struct SetStandardHeap
3.111 + : public Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> > {
3.112 + typedef Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> >
3.113 Create;
3.114 };
3.115
3.116 template <class T>
3.117 - struct DefOperationTraitsTraits : public Traits {
3.118 + struct SetOperationTraitsTraits : public Traits {
3.119 typedef T OperationTraits;
3.120 };
3.121
3.122 @@ -467,9 +466,9 @@
3.123 ///\ref named-templ-param "Named parameter" for setting
3.124 ///\ref OperationTraits type.
3.125 template <class T>
3.126 - struct DefOperationTraits
3.127 - : public Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> > {
3.128 - typedef Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> >
3.129 + struct SetOperationTraits
3.130 + : public Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> > {
3.131 + typedef Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> >
3.132 Create;
3.133 };
3.134
3.135 @@ -1199,10 +1198,10 @@
3.136 }
3.137
3.138 template<class T>
3.139 - struct DefPredMapBase : public Base {
3.140 + struct SetPredMapBase : public Base {
3.141 typedef T PredMap;
3.142 static PredMap *createPredMap(const Digraph &) { return 0; };
3.143 - DefPredMapBase(const TR &b) : TR(b) {}
3.144 + SetPredMapBase(const TR &b) : TR(b) {}
3.145 };
3.146 ///\brief \ref named-templ-param "Named parameter"
3.147 ///for setting \ref PredMap object.
3.148 @@ -1210,17 +1209,17 @@
3.149 ///\ref named-templ-param "Named parameter"
3.150 ///for setting \ref PredMap object.
3.151 template<class T>
3.152 - DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
3.153 + DijkstraWizard<SetPredMapBase<T> > predMap(const T &t)
3.154 {
3.155 Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
3.156 - return DijkstraWizard<DefPredMapBase<T> >(*this);
3.157 + return DijkstraWizard<SetPredMapBase<T> >(*this);
3.158 }
3.159
3.160 template<class T>
3.161 - struct DefProcessedMapBase : public Base {
3.162 + struct SetProcessedMapBase : public Base {
3.163 typedef T ProcessedMap;
3.164 static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
3.165 - DefProcessedMapBase(const TR &b) : TR(b) {}
3.166 + SetProcessedMapBase(const TR &b) : TR(b) {}
3.167 };
3.168 ///\brief \ref named-templ-param "Named parameter"
3.169 ///for setting \ref ProcessedMap object.
3.170 @@ -1228,17 +1227,17 @@
3.171 /// \ref named-templ-param "Named parameter"
3.172 ///for setting \ref ProcessedMap object.
3.173 template<class T>
3.174 - DijkstraWizard<DefProcessedMapBase<T> > processedMap(const T &t)
3.175 + DijkstraWizard<SetProcessedMapBase<T> > processedMap(const T &t)
3.176 {
3.177 Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
3.178 - return DijkstraWizard<DefProcessedMapBase<T> >(*this);
3.179 + return DijkstraWizard<SetProcessedMapBase<T> >(*this);
3.180 }
3.181
3.182 template<class T>
3.183 - struct DefDistMapBase : public Base {
3.184 + struct SetDistMapBase : public Base {
3.185 typedef T DistMap;
3.186 static DistMap *createDistMap(const Digraph &) { return 0; };
3.187 - DefDistMapBase(const TR &b) : TR(b) {}
3.188 + SetDistMapBase(const TR &b) : TR(b) {}
3.189 };
3.190 ///\brief \ref named-templ-param "Named parameter"
3.191 ///for setting \ref DistMap object.
3.192 @@ -1246,10 +1245,10 @@
3.193 ///\ref named-templ-param "Named parameter"
3.194 ///for setting \ref DistMap object.
3.195 template<class T>
3.196 - DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
3.197 + DijkstraWizard<SetDistMapBase<T> > distMap(const T &t)
3.198 {
3.199 Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
3.200 - return DijkstraWizard<DefDistMapBase<T> >(*this);
3.201 + return DijkstraWizard<SetDistMapBase<T> >(*this);
3.202 }
3.203
3.204 };
4.1 --- a/test/heap_test.cc Mon Aug 18 20:33:11 2008 +0200
4.2 +++ b/test/heap_test.cc Mon Sep 01 22:00:40 2008 +0200
4.3 @@ -131,7 +131,7 @@
4.4 void dijkstraHeapTest(const Digraph& digraph, const IntArcMap& length,
4.5 Node source) {
4.6
4.7 - typename Dijkstra<Digraph, IntArcMap>::template DefStandardHeap<Heap>::
4.8 + typename Dijkstra<Digraph, IntArcMap>::template SetStandardHeap<Heap>::
4.9 Create dijkstra(digraph, length);
4.10
4.11 dijkstra.run(source);