1.1 --- a/test/circulation_test.cc Tue Apr 21 13:08:19 2009 +0100
1.2 +++ b/test/circulation_test.cc Tue Apr 21 15:18:54 2009 +0100
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,24 +68,24 @@
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 VType v;
1.21 bool b;
1.22
1.23 - typedef Circulation<Digraph, CapMap, CapMap, DeltaMap>
1.24 + typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
1.25 ::SetFlowMap<FlowMap>
1.26 ::SetElevator<Elev>
1.27 ::SetStandardElevator<LinkedElev>
1.28 ::Create CirculationType;
1.29 - CirculationType circ_test(g, lcap, ucap, delta);
1.30 + CirculationType circ_test(g, lcap, ucap, supply);
1.31 const CirculationType& const_circ_test = circ_test;
1.32
1.33 circ_test
1.34 - .lowerCapMap(lcap)
1.35 - .upperCapMap(ucap)
1.36 - .deltaMap(delta)
1.37 + .lowerMap(lcap)
1.38 + .upperMap(ucap)
1.39 + .supplyMap(supply)
1.40 .flowMap(flow);
1.41
1.42 circ_test.init();