diff -r a5e9303a5511 -r eb61fbc64c16 src/work/marci/leda/bipartite_matching_leda.cc --- a/src/work/marci/leda/bipartite_matching_leda.cc Mon Aug 23 11:06:00 2004 +0000 +++ b/src/work/marci/leda/bipartite_matching_leda.cc Mon Aug 23 11:26:09 2004 +0000 @@ -14,11 +14,11 @@ //#include //#include #include -#include +#include #include #include #include -#include +#include /** * Inicializalja a veletlenszamgeneratort. @@ -95,7 +95,7 @@ BGW::NodeMap dbyj(bgw); BGW::EdgeMap dbyxcj(bgw); - typedef stGraphWrapper stGW; + typedef stBipartiteGraphWrapper stGW; stGW stgw(bgw); ConstMap const1map(1); @@ -109,9 +109,10 @@ // while (max_flow_test.augmentOnShortestPath()) { } typedef SageGraph MutableGraph; // while (max_flow_test.augmentOnBlockingFlow1()) { - while (max_flow_test.augmentOnBlockingFlow2()) { - std::cout << max_flow_test.flowValue() << std::endl; - } +// while (max_flow_test.augmentOnBlockingFlow2()) { +// std::cout << max_flow_test.flowValue() << std::endl; +// } + max_flow_test.run(); std::cout << "max flow value: " << max_flow_test.flowValue() << std::endl; std::cout << "elapsed time: " << ts << std::endl;