diff -r 8f41a3129746 -r 814ba94d9989 test/min_cost_flow_test.cc --- a/test/min_cost_flow_test.cc Sun Oct 05 13:37:17 2008 +0000 +++ b/test/min_cost_flow_test.cc Sun Oct 05 13:46:07 2008 +0000 @@ -204,16 +204,6 @@ NetworkSimplex mcf5(gr,l2,u,c,s2); checkMcf("#G5",mcf5,gr,l2,u,c,s2,mcf5.run(pr),true, 5970); NetworkSimplex mcf6(gr,l2,u,c,v,w,27); checkMcf("#G6",mcf6,gr,l2,u,c,s3,mcf6.run(pr),true, 8010); } - // Testing NetworkSimplex (with LIMITED_SEARCH_PIVOT) - { - NetworkSimplex::PivotRuleEnum pr = NetworkSimplex::LIMITED_SEARCH_PIVOT; - NetworkSimplex mcf1(gr,u,c,s1); checkMcf("#H1",mcf1,gr,l1,u,c,s1,mcf1.run(pr),true, 0); - NetworkSimplex mcf2(gr,u,c,s2); checkMcf("#H2",mcf2,gr,l1,u,c,s2,mcf2.run(pr),true, 5240); - NetworkSimplex mcf3(gr,u,c,v,w,27); checkMcf("#H3",mcf3,gr,l1,u,c,s3,mcf3.run(pr),true, 7620); - NetworkSimplex mcf4(gr,l2,u,c,s1); checkMcf("#H4",mcf4,gr,l2,u,c,s1,mcf4.run(pr),false, 0); - NetworkSimplex mcf5(gr,l2,u,c,s2); checkMcf("#H5",mcf5,gr,l2,u,c,s2,mcf5.run(pr),true, 5970); - NetworkSimplex mcf6(gr,l2,u,c,v,w,27); checkMcf("#H6",mcf6,gr,l2,u,c,s3,mcf6.run(pr),true, 8010); - } // Testing NetworkSimplex (with CANDIDATE_LIST_PIVOT) { NetworkSimplex::PivotRuleEnum pr = NetworkSimplex::CANDIDATE_LIST_PIVOT; @@ -224,6 +214,16 @@ NetworkSimplex mcf5(gr,l2,u,c,s2); checkMcf("#I5",mcf5,gr,l2,u,c,s2,mcf5.run(pr),true, 5970); NetworkSimplex mcf6(gr,l2,u,c,v,w,27); checkMcf("#I6",mcf6,gr,l2,u,c,s3,mcf6.run(pr),true, 8010); } + // Testing NetworkSimplex (with ALTERING_LIST_PIVOT) + { + NetworkSimplex::PivotRuleEnum pr = NetworkSimplex::ALTERING_LIST_PIVOT; + NetworkSimplex mcf1(gr,u,c,s1); checkMcf("#H1",mcf1,gr,l1,u,c,s1,mcf1.run(pr),true, 0); + NetworkSimplex mcf2(gr,u,c,s2); checkMcf("#H2",mcf2,gr,l1,u,c,s2,mcf2.run(pr),true, 5240); + NetworkSimplex mcf3(gr,u,c,v,w,27); checkMcf("#H3",mcf3,gr,l1,u,c,s3,mcf3.run(pr),true, 7620); + NetworkSimplex mcf4(gr,l2,u,c,s1); checkMcf("#H4",mcf4,gr,l2,u,c,s1,mcf4.run(pr),false, 0); + NetworkSimplex mcf5(gr,l2,u,c,s2); checkMcf("#H5",mcf5,gr,l2,u,c,s2,mcf5.run(pr),true, 5970); + NetworkSimplex mcf6(gr,l2,u,c,v,w,27); checkMcf("#H6",mcf6,gr,l2,u,c,s3,mcf6.run(pr),true, 8010); + } // Testing CycleCanceling (with BellmanFord) {