1.1 --- a/src/work/jacint/preflow_res.h	Sat Apr 24 12:44:41 2004 +0000
     1.2 +++ b/src/work/jacint/preflow_res.h	Sat Apr 24 12:53:46 2004 +0000
     1.3 @@ -490,7 +490,7 @@
     1.4  
     1.5  } //namespace hugo
     1.6  
     1.7 -#endif //PREFLOW_H
     1.8 +#endif //HUGO_PREFLOW_RES_H
     1.9  
    1.10  
    1.11  

     2.1 --- a/src/work/makefile	Sat Apr 24 12:44:41 2004 +0000
     2.2 +++ b/src/work/makefile	Sat Apr 24 12:53:46 2004 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  INCLUDEDIRS ?= -I../include -I. -I./{marci,jacint,alpar,klao,akos}
     2.5 -CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
     2.6 +CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
     2.7  
     2.8  BINARIES ?= bin_heap_demo
     2.9  

     3.1 --- a/src/work/marci/edmonds_karp_demo.cc	Sat Apr 24 12:44:41 2004 +0000
     3.2 +++ b/src/work/marci/edmonds_karp_demo.cc	Sat Apr 24 12:53:46 2004 +0000
     3.3 @@ -9,7 +9,7 @@
     3.4  #include <time_measure.h>
     3.5  //#include <graph_wrapper.h>
     3.6  #include <preflow.h>
     3.7 -#include <preflowproba.h>
     3.8 +#include <preflow_res.h>
     3.9  #include <for_each_macros.h>
    3.10  
    3.11  using namespace hugo;
    3.12 @@ -72,8 +72,8 @@
    3.13    Graph::EdgeMap<int> flow(G); //0 flow
    3.14    Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    3.15      pre_flow_test(G, s, t, cap, flow, true);
    3.16 -  PreflowProba<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    3.17 -    pre_flow_proba(G, s, t, cap, flow, true, true);
    3.18 +  PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    3.19 +    pre_flow_res(G, s, t, cap, flow, true);
    3.20    MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
    3.21      max_flow_test(G, s, t, cap, flow);
    3.22  
    3.23 @@ -89,7 +89,7 @@
    3.24      std::cout << "wrapped preflow ..." << std::endl;
    3.25      FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
    3.26      ts.reset();
    3.27 -    pre_flow_proba.run();
    3.28 +    pre_flow_res.run();
    3.29      std::cout << "elapsed time: " << ts << std::endl;
    3.30      std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
    3.31    }