Changeset 886:7ef7a5fbb85d in lemon

Timestamp:

11/13/09 00:37:55 (14 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Rebase:

63313365636433613635626132303738343865306262663962663135333037633237623361346233

Message:

Rename a private type in MCF classes (#180)

The new MCF algorithms define a private map type VectorMap?,
which could be misleading, since there is an other VectorMap?
defined in lemon/bits/vector_map.h. Thus the new type is
is renamed to StaticVectorMap?.

Location:

lemon

Files:

• cost_scaling.h (modified) (2 diffs)
• cycle_canceling.h (modified) (3 diffs)

lemon/cost_scaling.h

@@ -206 +206 @@
   
     template <typename KT, typename VT>
-    class VectorMap {
+    class StaticVectorMap {
     public:
       typedef KT Key;
       typedef VT Value;
       
-      VectorMap(std::vector<Value>& v) : _v(v) {}
+      StaticVectorMap(std::vector<Value>& v) : _v(v) {}
       
       const Value& operator[](const Key& key) const {
@@ -229 +229 @@
     };
 
-    typedef VectorMap<StaticDigraph::Node, LargeCost> LargeCostNodeMap;
-    typedef VectorMap<StaticDigraph::Arc, LargeCost> LargeCostArcMap;
+    typedef StaticVectorMap<StaticDigraph::Node, LargeCost> LargeCostNodeMap;
+    typedef StaticVectorMap<StaticDigraph::Arc, LargeCost> LargeCostArcMap;
 
   private:

lemon/cycle_canceling.h

@@ -153 +153 @@
   
     template <typename KT, typename VT>
-    class VectorMap {
+    class StaticVectorMap {
     public:
       typedef KT Key;
       typedef VT Value;
       
-      VectorMap(std::vector<Value>& v) : _v(v) {}
+      StaticVectorMap(std::vector<Value>& v) : _v(v) {}
       
       const Value& operator[](const Key& key) const {
@@ -176 +176 @@
     };
 
-    typedef VectorMap<StaticDigraph::Node, Cost> CostNodeMap;
-    typedef VectorMap<StaticDigraph::Arc, Cost> CostArcMap;
+    typedef StaticVectorMap<StaticDigraph::Node, Cost> CostNodeMap;
+    typedef StaticVectorMap<StaticDigraph::Arc, Cost> CostArcMap;
 
   private:
@@ -801 +801 @@
       const double BF_LIMIT_FACTOR = 1.5;
       
-      typedef VectorMap<StaticDigraph::Arc, Value> FilterMap;
+      typedef StaticVectorMap<StaticDigraph::Arc, Value> FilterMap;
       typedef FilterArcs<StaticDigraph, FilterMap> ResDigraph;
-      typedef VectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
+      typedef StaticVectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
       typedef typename BellmanFord<ResDigraph, CostArcMap>
         ::template SetDistMap<CostNodeMap>