diff -r 0ba8dfce7259 -r 85cb3aa71cce test/circulation_test.cc --- a/test/circulation_test.cc Tue Apr 21 13:08:19 2009 +0100 +++ b/test/circulation_test.cc Tue Apr 21 15:18:54 2009 +0100 @@ -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,24 +68,24 @@ Node n; Arc a; CapMap lcap, ucap; - DeltaMap delta; + SupplyMap supply; FlowMap flow; BarrierMap bar; VType v; bool b; - typedef Circulation + typedef Circulation ::SetFlowMap ::SetElevator ::SetStandardElevator ::Create CirculationType; - CirculationType circ_test(g, lcap, ucap, delta); + CirculationType circ_test(g, lcap, ucap, supply); const CirculationType& const_circ_test = circ_test; circ_test - .lowerCapMap(lcap) - .upperCapMap(ucap) - .deltaMap(delta) + .lowerMap(lcap) + .upperMap(ucap) + .supplyMap(supply) .flowMap(flow); circ_test.init();