Changeset 1167:e018899c2926 in lemon-main

Timestamp:

03/22/18 18:55:59 (7 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Use tolerance in max_flow_test.cc (#608)

File:

• test/max_flow_test.cc (modified) (10 diffs)

test/max_flow_test.cc

@@ -27 +27 @@
 #include <lemon/lgf_reader.h>
 #include <lemon/elevator.h>
+#include <lemon/tolerance.h>
 
 using namespace lemon;
@@ -66 +67 @@
   "target 8\n";
 
-
 // Checks the general interface of a max flow algorithm
 template <typename GR, typename CAP>
@@ -198 +198 @@
                const SmartDigraph::ArcMap<T>& flow,
                const SmartDigraph::ArcMap<T>& cap,
-               SmartDigraph::Node s, SmartDigraph::Node t) {
+               SmartDigraph::Node s, SmartDigraph::Node t,
+               const Tolerance<T>& tol) {
 
   for (SmartDigraph::ArcIt e(g); e != INVALID; ++e) {
-    if (flow[e] < 0 || flow[e] > cap[e]) return false;
+    if (tol.negative(flow[e]) || tol.less(cap[e], flow[e])) return false;
   }
 
@@ -213 +214 @@
       sum -= flow[e];
     }
-    if (sum != 0) return false;
+    if (tol.nonZero(sum)) return false;
   }
   return true;
@@ -251 +252 @@
   typedef CapMap FlowMap;
   typedef BoolNodeMap CutMap;
+
+  Tolerance<Value> tol;
 
   Digraph g;
@@ -265 +268 @@
   max_flow.run();
 
-  check(checkFlow(g, max_flow.flowMap(), cap, s, t),
+  check(checkFlow(g, max_flow.flowMap(), cap, s, t, tol),
         "The flow is not feasible.");
 
@@ -272 +275 @@
   Value min_cut_value = cutValue(g, min_cut, cap);
 
-  check(max_flow.flowValue() == min_cut_value,
+  check(!tol.different(max_flow.flowValue(), min_cut_value),
         "The max flow value is not equal to the min cut value.");
 
@@ -289 +292 @@
   min_cut_value = cutValue(g, min_cut1, cap);
 
-  check(max_flow.flowValue() == min_cut_value &&
-        min_cut_value == 2 * flow_value,
+  check(!tol.different(max_flow.flowValue(), min_cut_value) &&
+        !tol.different(min_cut_value, 2 * flow_value),
         "The max flow value or the min cut value is wrong.");
 
   SF::startSecondPhase(max_flow);       // start second phase of the algorithm
 
-  check(checkFlow(g, max_flow.flowMap(), cap, s, t),
+  check(checkFlow(g, max_flow.flowMap(), cap, s, t, tol),
         "The flow is not feasible.");
 
@@ -302 +305 @@
   min_cut_value = cutValue(g, min_cut2, cap);
 
-  check(max_flow.flowValue() == min_cut_value &&
-        min_cut_value == 2 * flow_value,
+  check(!tol.different(max_flow.flowValue(), min_cut_value) &&
+        !tol.different(min_cut_value, 2 * flow_value),
         "The max flow value or the min cut value was not doubled.");
 
@@ -325 +328 @@
   min_cut_value = cutValue(g, min_cut3, cap);
 
-  check(max_flow.flowValue() == min_cut_value,
+  check(!tol.different(max_flow.flowValue(), min_cut_value),
         "The max flow value or the min cut value is wrong.");
 }