Ticket #180: 180-cas3-c9964582a1bd.patch

test/min_cost_flow_test.cc

@@ -24 +24 @@
 #include <lemon/lgf_reader.h>
 
 #include <lemon/network_simplex.h>
+#include <lemon/capacity_scaling.h>
 
 #include <lemon/concepts/digraph.h>
 #include <lemon/concept_check.h>
@@ -279 +280 @@
                   NetworkSimplex<GR, double> >();
     checkConcept< McfClassConcept<GR, int, double>,
                   NetworkSimplex<GR, int, double> >();
+
+    checkConcept< McfClassConcept<GR, int, int>,
+                  CapacityScaling<GR> >();
+    checkConcept< McfClassConcept<GR, double, double>,
+                  CapacityScaling<GR, double> >();
+    checkConcept< McfClassConcept<GR, int, double>,
+                  CapacityScaling<GR, int, double> >();
   }
 
   // Run various MCF tests
@@ -446 +454 @@
              gr, l2, u, c, s1, mcf.OPTIMAL, true,   5970, "#B5");
   }
 
+  // C. Test CapacityScaling
+  {
+    CapacityScaling<Digraph> mcf(gr);
+
+    // Check the equality form
+    mcf.upperMap(u).costMap(c);
+    checkMcf(mcf, mcf.supplyMap(s1).run(),
+             gr, l1, u, c, s1, mcf.OPTIMAL, true,   5240, "#C1");
+    checkMcf(mcf, mcf.stSupply(v, w, 27).run(),
+             gr, l1, u, c, s2, mcf.OPTIMAL, true,   7620, "#C2");
+    mcf.lowerMap(l2);
+    checkMcf(mcf, mcf.supplyMap(s1).run(),
+             gr, l2, u, c, s1, mcf.OPTIMAL, true,   5970, "#C3");
+    checkMcf(mcf, mcf.stSupply(v, w, 27).run(),
+             gr, l2, u, c, s2, mcf.OPTIMAL, true,   8010, "#C4");
+    mcf.reset();
+    checkMcf(mcf, mcf.supplyMap(s1).run(),
+             gr, l1, cu, cc, s1, mcf.OPTIMAL, true,   74, "#C5");
+
+    checkMcf(mcf, mcf.lowerMap(l2).stSupply(v, w, 27).run(),
+             gr, l2, cu, cc, s2, mcf.OPTIMAL, true,   94, "#C6");
+    mcf.reset();
+    checkMcf(mcf, mcf.run(),
+             gr, l1, cu, cc, s3, mcf.OPTIMAL, true,    0, "#C7");
+    checkMcf(mcf, mcf.lowerMap(l2).upperMap(u).run(),
+             gr, l2, u, cc, s3, mcf.INFEASIBLE, false, 0, "#C8");
+    mcf.reset().lowerMap(l3).upperMap(u).costMap(c).supplyMap(s4);
+    checkMcf(mcf, mcf.run(),
+             gr, l3, u, c, s4, mcf.OPTIMAL, true,   6360, "#C9");
+    mcf.reset();
+    checkMcf(mcf, mcf.run(false),
+             gr, l1, cu, cc, s3, mcf.OPTIMAL, true,    0, "#C10");
+    checkMcf(mcf, mcf.lowerMap(l2).upperMap(u).run(false),
+             gr, l2, u, cc, s3, mcf.INFEASIBLE, false, 0, "#C11");
+    mcf.reset().lowerMap(l3).upperMap(u).costMap(c).supplyMap(s4);
+    checkMcf(mcf, mcf.run(false),
+             gr, l3, u, c, s4, mcf.OPTIMAL, true,   6360, "#C12");
+
+    // Check the GEQ form
+    mcf.reset().upperMap(u).costMap(c).supplyMap(s5);
+    checkMcf(mcf, mcf.run(),
+             gr, l1, u, c, s5, mcf.OPTIMAL, true,   3530, "#C13", GEQ);
+    checkMcf(mcf, mcf.lowerMap(l2).run(),
+             gr, l2, u, c, s5, mcf.OPTIMAL, true,   4540, "#C14", GEQ);
+    mcf.supplyMap(s6);
+    checkMcf(mcf, mcf.run(),
+             gr, l2, u, c, s6, mcf.INFEASIBLE, false,  0, "#C15", GEQ);
+  }
+
   return 0;
 }