1.1 --- a/src/work/marci/edmonds_karp_demo.cc	Sat Apr 24 12:44:41 2004 +0000
     1.2 +++ b/src/work/marci/edmonds_karp_demo.cc	Sat Apr 24 12:53:46 2004 +0000
     1.3 @@ -9,7 +9,7 @@
     1.4  #include <time_measure.h>
     1.5  //#include <graph_wrapper.h>
     1.6  #include <preflow.h>
     1.7 -#include <preflowproba.h>
     1.8 +#include <preflow_res.h>
     1.9  #include <for_each_macros.h>
    1.10  
    1.11  using namespace hugo;
    1.12 @@ -72,8 +72,8 @@
    1.13    Graph::EdgeMap<int> flow(G); //0 flow
    1.14    Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.15      pre_flow_test(G, s, t, cap, flow, true);
    1.16 -  PreflowProba<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.17 -    pre_flow_proba(G, s, t, cap, flow, true, true);
    1.18 +  PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.19 +    pre_flow_res(G, s, t, cap, flow, true);
    1.20    MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    1.21      max_flow_test(G, s, t, cap, flow);
    1.22  
    1.23 @@ -89,7 +89,7 @@
    1.24      std::cout << "wrapped preflow ..." << std::endl;
    1.25      FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
    1.26      ts.reset();
    1.27 -    pre_flow_proba.run();
    1.28 +    pre_flow_res.run();
    1.29      std::cout << "elapsed time: " << ts << std::endl;
    1.30      std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
    1.31    }