1.1 --- a/src/work/marci/max_flow_demo.cc	Tue Sep 14 09:53:57 2004 +0000
     1.2 +++ b/src/work/marci/max_flow_demo.cc	Tue Sep 14 10:09:24 2004 +0000
     1.3 @@ -12,7 +12,7 @@
     1.4  #include <hugo/dimacs.h>
     1.5  #include <hugo/time_measure.h>
     1.6  //#include <graph_wrapper.h>
     1.7 -#include <hugo/max_flow.h>
     1.8 +#include <hugo/preflow.h>
     1.9  #include <augmenting_flow.h>
    1.10  //#include <preflow_res.h>
    1.11  #include <for_each_macros.h>
    1.12 @@ -38,7 +38,7 @@
    1.13    readDimacs(std::cin, g, cap, s, t);
    1.14    Timer ts;
    1.15    Graph::EdgeMap<int> flow(g); //0 flow
    1.16 -  MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.17 +  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.18      max_flow_test(g, s, t, cap, flow);
    1.19    AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.20      augmenting_flow_test(g, s, t, cap, flow);
    1.21 @@ -51,7 +51,7 @@
    1.22      max_flow_test.run();
    1.23      std::cout << "elapsed time: " << ts << std::endl;
    1.24      std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
    1.25 -    max_flow_test.actMinCut(cut);
    1.26 +    max_flow_test.minCut(cut);
    1.27  
    1.28      FOR_EACH_LOC(Graph::EdgeIt, e, g) {
    1.29        if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
    1.30 @@ -65,7 +65,7 @@
    1.31      std::cout << "preflow ..." << std::endl;
    1.32      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.33      ts.reset();
    1.34 -    max_flow_test.preflow(MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
    1.35 +    max_flow_test.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
    1.36      std::cout << "elapsed time: " << ts << std::endl;
    1.37      std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
    1.38