diff -r 81a0c2f2f7c6 -r 327f7cf13843 src/work/athos/minlength_demo.cc --- a/src/work/athos/minlength_demo.cc Tue May 11 14:58:09 2004 +0000 +++ b/src/work/athos/minlength_demo.cc Tue May 11 15:42:11 2004 +0000 @@ -2,8 +2,9 @@ #include #include -#include -#include +#include +#include +#include "minlengthpaths.h" //#include using namespace hugo; @@ -19,9 +20,9 @@ Graph G; Node s, t; Graph::EdgeMap cap(G); - readDimacsMaxFlow(std::cin, G, s, t, cap); + readDimacs(std::cin, G, cap, s, t); - std::cout << "preflow demo (ATHOS)..." << std::endl; + std::cout << "Minlengthpaths demo (ATHOS)..." << std::endl; //Graph::EdgeMap flow(G); //0 flow // double pre_time=currTime(); @@ -31,8 +32,14 @@ k = atoi(argv[1]); MinLengthPaths > surb_test(G,cap); - std::cout << surb_test.run(s,t,k) << std::endl; - std::cout << surb_test.totalLength() << std::endl; + Timer ts; + ts.reset(); + std::cout << "Number of found paths: " << surb_test.run(s,t,k) << std::endl; + std::cout << "elapsed time: " << ts << std::endl; + + std::cout << "Total length of found paths: " << surb_test.totalLength() << std::endl; + //std::cout << (surb_test.checkComplementarySlackness() ? "OK (compl. slackn.)." : "Problem (compl. slackn.)!!!") << std::endl; + //preflow_push max_flow_test(G, s, t, cap); //int flow_value=max_flow_test.run();