test/circulation_test.cc
changeset 602 dacc2cee2b4c
parent 440 88ed40ad0d4f
child 603 85cb3aa71cce
     1.1 --- a/test/circulation_test.cc	Fri Apr 17 18:04:36 2009 +0200
     1.2 +++ b/test/circulation_test.cc	Fri Apr 17 18:14:35 2009 +0200
     1.3 @@ -57,7 +57,7 @@
     1.4    typedef Digraph::Node Node;
     1.5    typedef Digraph::Arc Arc;
     1.6    typedef concepts::ReadMap<Arc,VType> CapMap;
     1.7 -  typedef concepts::ReadMap<Node,VType> DeltaMap;
     1.8 +  typedef concepts::ReadMap<Node,VType> SupplyMap;
     1.9    typedef concepts::ReadWriteMap<Arc,VType> FlowMap;
    1.10    typedef concepts::WriteMap<Node,bool> BarrierMap;
    1.11  
    1.12 @@ -68,19 +68,19 @@
    1.13    Node n;
    1.14    Arc a;
    1.15    CapMap lcap, ucap;
    1.16 -  DeltaMap delta;
    1.17 +  SupplyMap supply;
    1.18    FlowMap flow;
    1.19    BarrierMap bar;
    1.20  
    1.21 -  Circulation<Digraph, CapMap, CapMap, DeltaMap>
    1.22 +  Circulation<Digraph, CapMap, CapMap, SupplyMap>
    1.23      ::SetFlowMap<FlowMap>
    1.24      ::SetElevator<Elev>
    1.25      ::SetStandardElevator<LinkedElev>
    1.26 -    ::Create circ_test(g,lcap,ucap,delta);
    1.27 +    ::Create circ_test(g,lcap,ucap,supply);
    1.28  
    1.29 -  circ_test.lowerCapMap(lcap);
    1.30 -  circ_test.upperCapMap(ucap);
    1.31 -  circ_test.deltaMap(delta);
    1.32 +  circ_test.lowerMap(lcap);
    1.33 +  circ_test.upperMap(ucap);
    1.34 +  circ_test.supplyMap(supply);
    1.35    flow = circ_test.flowMap();
    1.36    circ_test.flowMap(flow);
    1.37