COIN-OR::LEMON - Graph Library

Changeset 610:dacc2cee2b4c in lemon-1.2 for test


Ignore:
Timestamp:
04/17/09 18:14:35 (15 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Slightly modify the interface of Circulation and Preflow (#266)
in order to synchronize them to the interface of NetworkSimplex?.

Circulation:

  • The "delta" notation is replaced by "supply".
  • lowerCapMap(), upperCapMap() are renamed to lowerMap() and upperMap().
  • Value is renamed to Flow.

Preflow:

  • Value is renamed to Flow.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/circulation_test.cc

    r440 r610  
    5858  typedef Digraph::Arc Arc;
    5959  typedef concepts::ReadMap<Arc,VType> CapMap;
    60   typedef concepts::ReadMap<Node,VType> DeltaMap;
     60  typedef concepts::ReadMap<Node,VType> SupplyMap;
    6161  typedef concepts::ReadWriteMap<Arc,VType> FlowMap;
    6262  typedef concepts::WriteMap<Node,bool> BarrierMap;
     
    6969  Arc a;
    7070  CapMap lcap, ucap;
    71   DeltaMap delta;
     71  SupplyMap supply;
    7272  FlowMap flow;
    7373  BarrierMap bar;
    7474
    75   Circulation<Digraph, CapMap, CapMap, DeltaMap>
     75  Circulation<Digraph, CapMap, CapMap, SupplyMap>
    7676    ::SetFlowMap<FlowMap>
    7777    ::SetElevator<Elev>
    7878    ::SetStandardElevator<LinkedElev>
    79     ::Create circ_test(g,lcap,ucap,delta);
     79    ::Create circ_test(g,lcap,ucap,supply);
    8080
    81   circ_test.lowerCapMap(lcap);
    82   circ_test.upperCapMap(ucap);
    83   circ_test.deltaMap(delta);
     81  circ_test.lowerMap(lcap);
     82  circ_test.upperMap(ucap);
     83  circ_test.supplyMap(supply);
    8484  flow = circ_test.flowMap();
    8585  circ_test.flowMap(flow);
Note: See TracChangeset for help on using the changeset viewer.