Changeset 610:dacc2cee2b4c in lemon-main for test

Timestamp:

04/17/09 18:14:35 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Slightly modify the interface of Circulation and Preflow (#266)
in order to synchronize them to the interface of NetworkSimplex?.

Circulation:

• The "delta" notation is replaced by "supply".
• lowerCapMap(), upperCapMap() are renamed to lowerMap() and upperMap().
• Value is renamed to Flow.

Preflow:

• Value is renamed to Flow.

File:

• test/circulation_test.cc (modified) (2 diffs)

test/circulation_test.cc

@@ -58 +58 @@
   typedef Digraph::Arc Arc;
   typedef concepts::ReadMap<Arc,VType> CapMap;
-  typedef concepts::ReadMap<Node,VType> DeltaMap;
+  typedef concepts::ReadMap<Node,VType> SupplyMap;
   typedef concepts::ReadWriteMap<Arc,VType> FlowMap;
   typedef concepts::WriteMap<Node,bool> BarrierMap;
@@ -69 +69 @@
   Arc a;
   CapMap lcap, ucap;
-  DeltaMap delta;
+  SupplyMap supply;
   FlowMap flow;
   BarrierMap bar;
 
-  Circulation<Digraph, CapMap, CapMap, DeltaMap>
+  Circulation<Digraph, CapMap, CapMap, SupplyMap>
     ::SetFlowMap<FlowMap>
     ::SetElevator<Elev>
     ::SetStandardElevator<LinkedElev>
-    ::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);