1.1 --- a/test/gomory_hu_test.cc	Wed Feb 25 11:10:52 2009 +0000
     1.2 +++ b/test/gomory_hu_test.cc	Wed Feb 25 11:10:57 2009 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  #include "test_tools.h"
     1.5  #include <lemon/smart_graph.h>
     1.6  #include <lemon/lgf_reader.h>
     1.7 -#include <lemon/gomory_hu_tree.h>
     1.8 +#include <lemon/gomory_hu.h>
     1.9  #include <cstdlib>
    1.10  
    1.11  using namespace std;
    1.12 @@ -60,7 +60,7 @@
    1.13    GraphReader<Graph>(graph, input).
    1.14      edgeMap("capacity", capacity).run();
    1.15  
    1.16 -  GomoryHuTree<Graph> ght(graph, capacity);
    1.17 +  GomoryHu<Graph> ght(graph, capacity);
    1.18    ght.init();
    1.19    ght.run();
    1.20  
    1.21 @@ -75,14 +75,14 @@
    1.22        check(pf.flowValue() == cutValue(graph, cm, capacity), "Wrong cut 2");
    1.23  
    1.24        int sum=0;
    1.25 -      for(GomoryHuTree<Graph>::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a)
    1.26 +      for(GomoryHu<Graph>::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a)
    1.27          sum+=capacity[a]; 
    1.28        check(sum == ght.minCutValue(u, v), "Problem with MinCutEdgeIt");
    1.29  
    1.30        sum=0;
    1.31 -      for(GomoryHuTree<Graph>::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n)
    1.32 +      for(GomoryHu<Graph>::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n)
    1.33          sum++;
    1.34 -      for(GomoryHuTree<Graph>::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n)
    1.35 +      for(GomoryHu<Graph>::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n)
    1.36          sum++;
    1.37        check(sum == countNodes(graph), "Problem with MinCutNodeIt");
    1.38