1.1 --- a/src/work/marci/graph_wrapper_time.cc Tue Sep 14 09:53:57 2004 +0000
1.2 +++ b/src/work/marci/graph_wrapper_time.cc Tue Sep 14 10:09:24 2004 +0000
1.3 @@ -10,7 +10,7 @@
1.4 #include <hugo/invalid.h>
1.5 #include <hugo/time_measure.h>
1.6 #include <hugo/graph_wrapper.h>
1.7 -#include <hugo/max_flow.h>
1.8 +#include <hugo/preflow.h>
1.9 #include <hugo/dimacs.h>
1.10 #include <hugo/list_graph.h>
1.11
1.12 @@ -32,9 +32,9 @@
1.13 Timer ts;
1.14 ts.reset();
1.15
1.16 - typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
1.17 - MyMaxFlow max_flow(g, s, t, cap, flow);
1.18 - max_flow.run(MyMaxFlow::NO_FLOW);
1.19 + typedef Preflow<Graph, int, FlowMap, FlowMap> MyPreflow;
1.20 + MyPreflow max_flow(g, s, t, cap, flow);
1.21 + max_flow.run(MyPreflow::NO_FLOW);
1.22 cout << "flow value: " << max_flow.flowValue() << endl;
1.23 cout << ts << endl;
1.24 }