1.1 --- a/src/work/marci/leda/bipartite_matching_leda_gen.cc	Mon Aug 23 11:06:00 2004 +0000
     1.2 +++ b/src/work/marci/leda/bipartite_matching_leda_gen.cc	Mon Aug 23 11:26:09 2004 +0000
     1.3 @@ -14,11 +14,12 @@
     1.4  //#include <smart_graph.h>
     1.5  //#include <dimacs.h>
     1.6  #include <hugo/time_measure.h>
     1.7 -#include <hugo/for_each_macros.h>
     1.8 +#include <for_each_macros.h>
     1.9  #include <hugo/graph_wrapper.h>
    1.10  #include <bipartite_graph_wrapper.h>
    1.11  #include <hugo/maps.h>
    1.12 -#include <max_flow.h>
    1.13 +#include <hugo/max_flow.h>
    1.14 +#include <augmenting_flow.h>
    1.15  
    1.16  /**
    1.17   * Inicializalja a veletlenszamgeneratort.
    1.18 @@ -125,10 +126,12 @@
    1.19    ts.reset();
    1.20    FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
    1.21    typedef SageGraph MutableGraph;
    1.22 -  while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { }
    1.23 +  AugmentingFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
    1.24 +    max_flow_test_1(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow/*, true*/);
    1.25 +  while (max_flow_test_1.augmentOnBlockingFlow<MutableGraph>()) { }
    1.26    std::cout << "HUGO max matching algorithm based on blocking flow augmentation." 
    1.27  	    << std::endl << "Matching size: " 
    1.28 -	    << max_flow_test.flowValue() << std::endl;
    1.29 +	    << max_flow_test_1.flowValue() << std::endl;
    1.30    std::cout << "elapsed time: " << ts << std::endl;
    1.31  
    1.32    return 0;