COIN-OR::LEMON - Graph Library

Changeset 820:7ef7a5fbb85d in lemon-1.2


Ignore:
Timestamp:
11/13/09 00:37:55 (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/cost_scaling.h

    r813 r820  
    206206 
    207207    template <typename KT, typename VT>
    208     class VectorMap {
     208    class StaticVectorMap {
    209209    public:
    210210      typedef KT Key;
    211211      typedef VT Value;
    212212     
    213       VectorMap(std::vector<Value>& v) : _v(v) {}
     213      StaticVectorMap(std::vector<Value>& v) : _v(v) {}
    214214     
    215215      const Value& operator[](const Key& key) const {
     
    229229    };
    230230
    231     typedef VectorMap<StaticDigraph::Node, LargeCost> LargeCostNodeMap;
    232     typedef VectorMap<StaticDigraph::Arc, LargeCost> LargeCostArcMap;
     231    typedef StaticVectorMap<StaticDigraph::Node, LargeCost> LargeCostNodeMap;
     232    typedef StaticVectorMap<StaticDigraph::Arc, LargeCost> LargeCostArcMap;
    233233
    234234  private:
  • lemon/cycle_canceling.h

    r816 r820  
    153153 
    154154    template <typename KT, typename VT>
    155     class VectorMap {
     155    class StaticVectorMap {
    156156    public:
    157157      typedef KT Key;
    158158      typedef VT Value;
    159159     
    160       VectorMap(std::vector<Value>& v) : _v(v) {}
     160      StaticVectorMap(std::vector<Value>& v) : _v(v) {}
    161161     
    162162      const Value& operator[](const Key& key) const {
     
    176176    };
    177177
    178     typedef VectorMap<StaticDigraph::Node, Cost> CostNodeMap;
    179     typedef VectorMap<StaticDigraph::Arc, Cost> CostArcMap;
     178    typedef StaticVectorMap<StaticDigraph::Node, Cost> CostNodeMap;
     179    typedef StaticVectorMap<StaticDigraph::Arc, Cost> CostArcMap;
    180180
    181181  private:
     
    801801      const double BF_LIMIT_FACTOR = 1.5;
    802802     
    803       typedef VectorMap<StaticDigraph::Arc, Value> FilterMap;
     803      typedef StaticVectorMap<StaticDigraph::Arc, Value> FilterMap;
    804804      typedef FilterArcs<StaticDigraph, FilterMap> ResDigraph;
    805       typedef VectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
     805      typedef StaticVectorMap<StaticDigraph::Node, StaticDigraph::Arc> PredMap;
    806806      typedef typename BellmanFord<ResDigraph, CostArcMap>
    807807        ::template SetDistMap<CostNodeMap>
Note: See TracChangeset for help on using the changeset viewer.