COIN-OR::LEMON - Graph Library

Changeset 2277:a7896017fc7d in lemon-0.x for lemon/graph_adaptor.h


Ignore:
Timestamp:
10/31/06 09:28:55 (13 years ago)
Author:
Alpar Juttner
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3040
Message:

icpc-9.0 compilation bugfix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/graph_adaptor.h

    r2260 r2277  
    14311431  template<typename Graph, typename Number, 
    14321432           typename CapacityMap, typename FlowMap,
    1433            typename Tolerance = Tolerance<Number> >
     1433           typename Tol = Tolerance<Number> >
    14341434  class ResForwardFilter {
    14351435    const CapacityMap* capacity;
    14361436    const FlowMap* flow;
    1437     Tolerance tolerance;
     1437    Tol tolerance;
    14381438  public:
    14391439    typedef typename Graph::Edge Key;
     
    14411441
    14421442    ResForwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
    1443                      const Tolerance& _tolerance = Tolerance())
     1443                     const Tol& _tolerance = Tol())
    14441444      : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
    14451445
    1446     ResForwardFilter(const Tolerance& _tolerance)
     1446    ResForwardFilter(const Tol& _tolerance)
    14471447      : capacity(0), flow(0), tolerance(_tolerance)  { }
    14481448
     
    14571457  template<typename Graph, typename Number,
    14581458           typename CapacityMap, typename FlowMap,
    1459            typename Tolerance = Tolerance<Number> >
     1459           typename Tol = Tolerance<Number> >
    14601460  class ResBackwardFilter {
    14611461    const CapacityMap* capacity;
    14621462    const FlowMap* flow;
    1463     Tolerance tolerance;
     1463    Tol tolerance;
    14641464  public:
    14651465    typedef typename Graph::Edge Key;
     
    14671467
    14681468    ResBackwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
    1469                       const Tolerance& _tolerance = Tolerance())
     1469                      const Tol& _tolerance = Tol())
    14701470      : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
    1471     ResBackwardFilter(const Tolerance& _tolerance = Tolerance())
     1471    ResBackwardFilter(const Tol& _tolerance = Tol())
    14721472      : capacity(0), flow(0), tolerance(_tolerance) { }
    14731473    void setCapacity(const CapacityMap& _capacity) { capacity = &_capacity; }
     
    15171517  template<typename Graph, typename Number,
    15181518           typename CapacityMap, typename FlowMap,
    1519            typename Tolerance = Tolerance<Number> >
     1519           typename Tol = Tolerance<Number> >
    15201520  class ResGraphAdaptor :
    15211521    public EdgeSubGraphAdaptor<
     
    15691569    /// the flow map, the capacity map and a tolerance object.
    15701570    ResGraphAdaptor(const Graph& _graph, const CapacityMap& _capacity,
    1571                     FlowMap& _flow, const Tolerance& _tolerance = Tolerance())
     1571                    FlowMap& _flow, const Tol& _tolerance = Tol())
    15721572      : Parent(), capacity(&_capacity), flow(&_flow), ugraph(_graph),
    15731573        forward_filter(_capacity, _flow, _tolerance),
Note: See TracChangeset for help on using the changeset viewer.