Ticket #454: 454-daa8c50a0371.patch

lemon/capacity_scaling.h

@@ -762 +762 @@
         }
       }
 
+      // Check the residual capacity values
+      for (int j = 0; j != _res_arc_num; ++j) {
+        if (_res_cap[j] < 0) return INFEASIBLE;
+      }
+
       // Handle negative costs
       for (int i = 0; i != _root; ++i) {
         last_out = _first_out[i+1] - 1;

lemon/cost_scaling.h

@@ -840 +840 @@
         }
       }
 
+      // Check the capacity values
+      for (ArcIt a(_graph); a != INVALID; ++a) {
+        if (cap[a] < 0) return INFEASIBLE;
+      }
+
       _sup_node_num = 0;
       for (NodeIt n(_graph); n != INVALID; ++n) {
         if (sup[n] > 0) ++_sup_node_num;

lemon/cycle_canceling.h

@@ -731 +731 @@
         }
       }
 
+      // Check the capacity values
+      for (ArcIt a(_graph); a != INVALID; ++a) {
+        if (cap[a] < 0) return INFEASIBLE;
+      }
+
       // Find a feasible flow using Circulation
       Circulation<Digraph, ConstMap<Arc, Value>, ValueArcMap, ValueNodeMap>
         circ(_graph, low, cap, sup);

lemon/network_simplex.h

@@ -1072 +1072 @@
         }
       }
 
+      // Check the capacity values
+      for (int i = 0; i != _arc_num; ++i) {
+        if (_cap[i] < 0) return false;
+      }
+
       // Initialize artifical cost
       Cost ART_COST;
       if (std::numeric_limits<Cost>::is_exact) {

test/min_cost_flow_test.cc

@@ -112 +112 @@
   "      cost\n"
   "1 2     -1\n";
 
+char test_lb_lgf[] =
+  "@nodes\n"
+  "label   sup\n"
+  "    1    10\n"
+  "    2     0\n"
+  "    3     0\n"
+  "    4   -10\n"
+  "@arcs\n"
+  "    cost  cap low1 low2 low3\n"
+  "1 2    1   10    0    0    0\n"
+  "1 3    2   10    0    0    0\n"
+  "2 3    0    4    4    4    5\n"
+  "2 4    2   10    3    8    2\n"
+  "3 4    1   10    3    0    2\n";
+
 
 // Test data
 typedef ListDigraph Digraph;
@@ -133 +148 @@
 ConstMap<Arc, int> neg2_l(0), neg2_u(1000);
 Digraph::NodeMap<int> neg2_s(neg2_gr);
 
+Digraph lb_gr;
+Digraph::ArcMap<int> lb_c(lb_gr), lb_u(lb_gr), lb_l1(lb_gr), lb_l2(lb_gr), lb_l3(lb_gr);
+Digraph::NodeMap<int> lb_s(lb_gr);
+
 
 enum SupplyType {
   EQ,
@@ -331 +350 @@
                      const std::string &test_str = "",
                      bool full_neg_cost_support = false )
 {
-  MCF mcf1(gr), mcf2(neg1_gr), mcf3(neg2_gr);
+  MCF mcf1(gr), mcf2(neg1_gr), mcf3(neg2_gr), mcf_lb(lb_gr);
 
   // Basic tests
   mcf1.upperMap(u).costMap(c).supplyMap(s1);
@@ -395 +414 @@
   mcf3.upperMap(neg2_u);
   checkMcf(mcf3, mcf3.run(param), neg2_gr, neg2_l, neg2_u, neg2_c, neg2_s,
            mcf3.OPTIMAL, true,     -300, test_str + "-18", GEQ);
+           
+  // Tests with various lower bounds
+  mcf_lb.upperMap(lb_u).costMap(lb_c).supplyMap(lb_s);
+  mcf_lb.lowerMap(lb_l1);
+  checkMcf(mcf_lb, mcf_lb.run(param), lb_gr, lb_l1, lb_u, lb_c, lb_s,
+           mcf_lb.OPTIMAL, true,     26, test_str + "-19");
+  mcf_lb.lowerMap(lb_l2);
+  checkMcf(mcf_lb, mcf_lb.run(param), lb_gr, lb_l2, lb_u, lb_c, lb_s,
+           mcf_lb.INFEASIBLE, false,  0, test_str + "-20");
+  mcf_lb.lowerMap(lb_l3);
+  checkMcf(mcf_lb, mcf_lb.run(param), lb_gr, lb_l3, lb_u, lb_c, lb_s,
+           mcf_lb.INFEASIBLE, false,  0, test_str + "-21");
 }
 
 template < typename MCF, typename Param >
@@ -406 +437 @@
   mcf1.supplyType(mcf1.LEQ);
   mcf1.upperMap(u).costMap(c).supplyMap(s6);
   checkMcf(mcf1, mcf1.run(param), gr, l1, u, c, s6,
-           mcf1.OPTIMAL, true,   5080, test_str + "-19", LEQ);
+           mcf1.OPTIMAL, true,   5080, test_str + "-22", LEQ);
   mcf1.lowerMap(l2);
   checkMcf(mcf1, mcf1.run(param), gr, l2, u, c, s6,
-           mcf1.OPTIMAL, true,   5930, test_str + "-20", LEQ);
+           mcf1.OPTIMAL, true,   5930, test_str + "-23", LEQ);
   mcf1.supplyMap(s5);
   checkMcf(mcf1, mcf1.run(param), gr, l2, u, c, s5,
-           mcf1.INFEASIBLE, false,  0, test_str + "-21", LEQ);
+           mcf1.INFEASIBLE, false,  0, test_str + "-24", LEQ);
 }
 
 
@@ -450 +481 @@
     .nodeMap("sup", neg2_s)
     .run();
 
+  std::istringstream lb_inp(test_lb_lgf);
+  DigraphReader<Digraph>(lb_gr, lb_inp)
+    .arcMap("cost", lb_c)
+    .arcMap("cap", lb_u)
+    .arcMap("low1", lb_l1)
+    .arcMap("low2", lb_l2)
+    .arcMap("low3", lb_l3)
+    .nodeMap("sup", lb_s)
+    .run();
+
   // Check the interface of NetworkSimplex
   {
     typedef concepts::Digraph GR;