diff -r 40fcfa5bfc32 -r fc549fac0dd0 src/work/jacint/dijkstra.cc --- a/src/work/jacint/dijkstra.cc Sat Mar 20 16:10:26 2004 +0000 +++ b/src/work/jacint/dijkstra.cc Sat Mar 20 16:13:19 2004 +0000 @@ -25,12 +25,12 @@ std::cout << "dijkstra demo ..." << std::endl; double pre_time=currTime(); - Dijkstra > > dijkstra_test(G, cap); - dijkstra_test.run(s); + dijkstra_test.run(s); double post_time=currTime(); - std::cout << "running time with fib_heap: " + std::cout << "running time with fib_heap: " << post_time-pre_time << " sec"<< std::endl; pre_time=currTime(); @@ -50,32 +50,32 @@ InEdgeIt e; for ( G.first(e,u); G.valid(e); G.next(e) ) { Node v=G.tail(e); - if ( dijkstra_test.dist(u) - dijkstra_test.dist(v) > cap.get(e) ) + if ( dijkstra_test.dist(u) - dijkstra_test.dist(v) > cap[e] ) { std::cout<<"Hibas el a fibonaccis Dijkstraban: " << dijkstra_test.dist(u) - dijkstra_test.dist(v) - - cap.get(e)< cap.get(e) ) + if ( dijkstra_test2.dist(u) - dijkstra_test2.dist(v) > cap[e] ) { std::cout<<"Hibas el a binarisos Dijkstraban: " << dijkstra_test2.dist(u) - dijkstra_test2.dist(v) - - cap.get(e)<