diff -r e6927fe719e6 -r dacc2cee2b4c test/circulation_test.cc --- a/test/circulation_test.cc Fri Apr 17 18:04:36 2009 +0200 +++ b/test/circulation_test.cc Fri Apr 17 18:14:35 2009 +0200 @@ -57,7 +57,7 @@ typedef Digraph::Node Node; typedef Digraph::Arc Arc; typedef concepts::ReadMap CapMap; - typedef concepts::ReadMap DeltaMap; + typedef concepts::ReadMap SupplyMap; typedef concepts::ReadWriteMap FlowMap; typedef concepts::WriteMap BarrierMap; @@ -68,19 +68,19 @@ Node n; Arc a; CapMap lcap, ucap; - DeltaMap delta; + SupplyMap supply; FlowMap flow; BarrierMap bar; - Circulation + Circulation ::SetFlowMap ::SetElevator ::SetStandardElevator - ::Create circ_test(g,lcap,ucap,delta); + ::Create circ_test(g,lcap,ucap,supply); - circ_test.lowerCapMap(lcap); - circ_test.upperCapMap(ucap); - circ_test.deltaMap(delta); + circ_test.lowerMap(lcap); + circ_test.upperMap(ucap); + circ_test.supplyMap(supply); flow = circ_test.flowMap(); circ_test.flowMap(flow);