Changeset 983:8b2d4e5d96e4 in lemon-1.2 for test/circulation_test.cc

Timestamp:

08/07/13 06:55:05 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

971:a26b90a17c81 (diff), 982:3e711ee55d31 (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 #294 to branches >=1.2

Files:

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

test/circulation_test.cc

@@ -74 +74 @@
   VType v;
   bool b;
-  ignore_unused_variable_warning(v,b);
+  ::lemon::ignore_unused_variable_warning(v,b);
 
   typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
@@ -105 +105 @@
   const_circ_test.barrierMap(bar);
 
-  ignore_unused_variable_warning(fm);
+  ::lemon::ignore_unused_variable_warning(fm);
 }
 

test/circulation_test.cc

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -83 +83 @@
   CirculationType circ_test(g, lcap, ucap, supply);
   const CirculationType& const_circ_test = circ_test;
-   
+
   circ_test
     .lowerMap(lcap)
@@ -89 +89 @@
     .supplyMap(supply)
     .flowMap(flow);
+
+  const CirculationType::Elevator& elev = const_circ_test.elevator();
+  circ_test.elevator(const_cast<CirculationType::Elevator&>(elev));
+  CirculationType::Tolerance tol = const_circ_test.tolerance();
+  circ_test.tolerance(tol);
 
   circ_test.init();
@@ -99 +104 @@
   b = const_circ_test.barrier(n);
   const_circ_test.barrierMap(bar);
-  
+
   ::lemon::ignore_unused_variable_warning(fm);
 }