1.1 --- a/lemon/cycle_canceling.h Fri Nov 13 00:24:39 2009 +0100
1.2 +++ b/lemon/cycle_canceling.h Fri Nov 13 00:37:55 2009 +0100
1.3 @@ -152,12 +152,12 @@
1.4 private:
1.5
1.6 template <typename KT, typename VT>
1.7 - class VectorMap {
1.8 + class StaticVectorMap {
1.9 public:
1.10 typedef KT Key;
1.11 typedef VT Value;
1.12
1.13 - VectorMap(std::vector<Value>& v) : _v(v) {}
1.14 + StaticVectorMap(std::vector<Value>& v) : _v(v) {}
1.15
1.16 const Value& operator[](const Key& key) const {
1.17 return _v[StaticDigraph::id(key)];
1.18 @@ -175,8 +175,8 @@
1.19 std::vector<Value>& _v;
1.20 };
1.21
1.22 - typedef VectorMap<StaticDigraph::Node, Cost> CostNodeMap;
1.23 - typedef VectorMap<StaticDigraph::Arc, Cost> CostArcMap;
1.24 + typedef StaticVectorMap<StaticDigraph::Node, Cost> CostNodeMap;
1.25 + typedef StaticVectorMap<StaticDigraph::Arc, Cost> CostArcMap;
1.26
1.27 private:
1.28
1.29 @@ -800,9 +800,9 @@
1.30 const int BF_FIRST_LIMIT = 2;
1.31 const double BF_LIMIT_FACTOR = 1.5;
1.32
1.33 - typedef VectorMap<StaticDigraph::Arc, Value> FilterMap;
1.34 + typedef StaticVectorMap<StaticDigraph::Arc, Value> FilterMap;
1.35 typedef FilterArcs<StaticDigraph, FilterMap> ResDigraph;
1.36 - typedef VectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
1.37 + typedef StaticVectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
1.38 typedef typename BellmanFord<ResDigraph, CostArcMap>
1.39 ::template SetDistMap<CostNodeMap>
1.40 ::template SetPredMap<PredMap>::Create BF;