Changeset 611:85cb3aa71cce in lemon1.2 for test/circulation_test.cc
 Timestamp:
 04/21/09 16:18:54 (10 years ago)
 Branch:
 default
 Children:
 612:0c8e5c688440, 613:b1811c363299, 619:ec817dfc2cb7
 Parents:
 600:0ba8dfce7259 (diff), 610:dacc2cee2b4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.  Phase:
 public
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

test/circulation_test.cc
r585 r611 58 58 typedef Digraph::Arc Arc; 59 59 typedef concepts::ReadMap<Arc,VType> CapMap; 60 typedef concepts::ReadMap<Node,VType> DeltaMap;60 typedef concepts::ReadMap<Node,VType> SupplyMap; 61 61 typedef concepts::ReadWriteMap<Arc,VType> FlowMap; 62 62 typedef concepts::WriteMap<Node,bool> BarrierMap; … … 69 69 Arc a; 70 70 CapMap lcap, ucap; 71 DeltaMap delta;71 SupplyMap supply; 72 72 FlowMap flow; 73 73 BarrierMap bar; … … 75 75 bool b; 76 76 77 typedef Circulation<Digraph, CapMap, CapMap, DeltaMap>77 typedef Circulation<Digraph, CapMap, CapMap, SupplyMap> 78 78 ::SetFlowMap<FlowMap> 79 79 ::SetElevator<Elev> 80 80 ::SetStandardElevator<LinkedElev> 81 81 ::Create CirculationType; 82 CirculationType circ_test(g, lcap, ucap, delta);82 CirculationType circ_test(g, lcap, ucap, supply); 83 83 const CirculationType& const_circ_test = circ_test; 84 84 85 85 circ_test 86 .lower CapMap(lcap)87 .upper CapMap(ucap)88 . deltaMap(delta)86 .lowerMap(lcap) 87 .upperMap(ucap) 88 .supplyMap(supply) 89 89 .flowMap(flow); 90 90 
test/circulation_test.cc
r610 r611 72 72 FlowMap flow; 73 73 BarrierMap bar; 74 VType v; 75 bool b; 74 76 75 Circulation<Digraph, CapMap, CapMap, SupplyMap> 76 ::SetFlowMap<FlowMap> 77 ::SetElevator<Elev> 78 ::SetStandardElevator<LinkedElev> 79 ::Create circ_test(g,lcap,ucap,supply); 80 81 circ_test.lowerMap(lcap); 82 circ_test.upperMap(ucap); 83 circ_test.supplyMap(supply); 84 flow = circ_test.flowMap(); 85 circ_test.flowMap(flow); 77 typedef Circulation<Digraph, CapMap, CapMap, SupplyMap> 78 ::SetFlowMap<FlowMap> 79 ::SetElevator<Elev> 80 ::SetStandardElevator<LinkedElev> 81 ::Create CirculationType; 82 CirculationType circ_test(g, lcap, ucap, supply); 83 const CirculationType& const_circ_test = circ_test; 84 85 circ_test 86 .lowerMap(lcap) 87 .upperMap(ucap) 88 .supplyMap(supply) 89 .flowMap(flow); 86 90 87 91 circ_test.init(); … … 90 94 circ_test.run(); 91 95 92 circ_test.barrier(n); 93 circ_test.barrierMap(bar); 94 circ_test.flow(a); 96 v = const_circ_test.flow(a); 97 const FlowMap& fm = const_circ_test.flowMap(); 98 b = const_circ_test.barrier(n); 99 const_circ_test.barrierMap(bar); 100 101 ignore_unused_variable_warning(fm); 95 102 } 96 103
Note: See TracChangeset
for help on using the changeset viewer.