test/min_cost_flow_test.cc
changeset 898 75c97c3786d6
parent 885 d93490b861e9
child 956 141f9c0db4a3
     1.1 --- a/test/min_cost_flow_test.cc	Tue Feb 09 23:29:51 2010 +0100
     1.2 +++ b/test/min_cost_flow_test.cc	Wed Feb 10 19:05:20 2010 +0100
     1.3 @@ -157,7 +157,7 @@
     1.4        MCF mcf(me.g);
     1.5        const MCF& const_mcf = mcf;
     1.6  
     1.7 -      b = mcf.reset()
     1.8 +      b = mcf.reset().resetParams()
     1.9               .lowerMap(me.lower)
    1.10               .upperMap(me.upper)
    1.11               .costMap(me.cost)
    1.12 @@ -346,7 +346,7 @@
    1.13    mcf1.stSupply(v, w, 27);
    1.14    checkMcf(mcf1, mcf1.run(param), gr, l2, u, c, s2,
    1.15             mcf1.OPTIMAL, true,     8010, test_str + "-4");
    1.16 -  mcf1.reset().supplyMap(s1);
    1.17 +  mcf1.resetParams().supplyMap(s1);
    1.18    checkMcf(mcf1, mcf1.run(param), gr, l1, cu, cc, s1,
    1.19             mcf1.OPTIMAL, true,       74, test_str + "-5");
    1.20    mcf1.lowerMap(l2).stSupply(v, w, 27);
    1.21 @@ -363,7 +363,7 @@
    1.22             mcf1.OPTIMAL, true,     6360, test_str + "-9");
    1.23  
    1.24    // Tests for the GEQ form
    1.25 -  mcf1.reset().upperMap(u).costMap(c).supplyMap(s5);
    1.26 +  mcf1.resetParams().upperMap(u).costMap(c).supplyMap(s5);
    1.27    checkMcf(mcf1, mcf1.run(param), gr, l1, u, c, s5,
    1.28             mcf1.OPTIMAL, true,     3530, test_str + "-10", GEQ);
    1.29    mcf1.lowerMap(l2);
    1.30 @@ -380,7 +380,7 @@
    1.31    mcf2.upperMap(neg1_u2);
    1.32    checkMcf(mcf2, mcf2.run(param), neg1_gr, neg1_l1, neg1_u2, neg1_c, neg1_s,
    1.33             mcf2.OPTIMAL, true,   -40000, test_str + "-14");
    1.34 -  mcf2.reset().lowerMap(neg1_l2).costMap(neg1_c).supplyMap(neg1_s);
    1.35 +  mcf2.resetParams().lowerMap(neg1_l2).costMap(neg1_c).supplyMap(neg1_s);
    1.36    checkMcf(mcf2, mcf2.run(param), neg1_gr, neg1_l2, neg1_u1, neg1_c, neg1_s,
    1.37             mcf2.UNBOUNDED, false,     0, test_str + "-15");
    1.38