Changeset 658:85cb3aa71cce in lemon for test/circulation_test.cc

Timestamp:

04/21/09 16:18:54 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

659:0c8e5c688440, 660:b1811c363299, 666:ec817dfc2cb7

Parents:

647:0ba8dfce7259 (diff), 657: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

Message:

Merge and fix

Files:

• test/circulation_test.cc (modified) (3 diffs)
• 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;
@@ -75 +75 @@
   bool b;
 
-  typedef Circulation<Digraph, CapMap, CapMap, DeltaMap>
+  typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
             ::SetFlowMap<FlowMap>
             ::SetElevator<Elev>
             ::SetStandardElevator<LinkedElev>
             ::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);
 

test/circulation_test.cc

@@ -72 +72 @@
   FlowMap flow;
   BarrierMap bar;
+  VType v;
+  bool b;
 
-  Circulation<Digraph, CapMap, CapMap, SupplyMap>
-    ::SetFlowMap<FlowMap>
-    ::SetElevator<Elev>
-    ::SetStandardElevator<LinkedElev>
-    ::Create circ_test(g,lcap,ucap,supply);
-
-  circ_test.lowerMap(lcap);
-  circ_test.upperMap(ucap);
-  circ_test.supplyMap(supply);
-  flow = circ_test.flowMap();
-  circ_test.flowMap(flow);
+  typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
+            ::SetFlowMap<FlowMap>
+            ::SetElevator<Elev>
+            ::SetStandardElevator<LinkedElev>
+            ::Create CirculationType;
+  CirculationType circ_test(g, lcap, ucap, supply);
+  const CirculationType& const_circ_test = circ_test;
+   
+  circ_test
+    .lowerMap(lcap)
+    .upperMap(ucap)
+    .supplyMap(supply)
+    .flowMap(flow);
 
   circ_test.init();
@@ -90 +94 @@
   circ_test.run();
 
-  circ_test.barrier(n);
-  circ_test.barrierMap(bar);
-  circ_test.flow(a);
+  v = const_circ_test.flow(a);
+  const FlowMap& fm = const_circ_test.flowMap();
+  b = const_circ_test.barrier(n);
+  const_circ_test.barrierMap(bar);
+  
+  ignore_unused_variable_warning(fm);
 }