diff -r ccd2d3a3001e -r e72bacfea6b7 test/gomory_hu_test.cc --- a/test/gomory_hu_test.cc Wed Feb 25 11:10:52 2009 +0000 +++ b/test/gomory_hu_test.cc Wed Feb 25 11:10:57 2009 +0000 @@ -3,7 +3,7 @@ #include "test_tools.h" #include #include -#include +#include #include using namespace std; @@ -60,7 +60,7 @@ GraphReader(graph, input). edgeMap("capacity", capacity).run(); - GomoryHuTree ght(graph, capacity); + GomoryHu ght(graph, capacity); ght.init(); ght.run(); @@ -75,14 +75,14 @@ check(pf.flowValue() == cutValue(graph, cm, capacity), "Wrong cut 2"); int sum=0; - for(GomoryHuTree::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a) + for(GomoryHu::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a) sum+=capacity[a]; check(sum == ght.minCutValue(u, v), "Problem with MinCutEdgeIt"); sum=0; - for(GomoryHuTree::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n) + for(GomoryHu::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n) sum++; - for(GomoryHuTree::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n) + for(GomoryHu::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n) sum++; check(sum == countNodes(graph), "Problem with MinCutNodeIt");