src/test/dijkstra_heap_test.cc
changeset 986 e997802b855c
parent 921 818510fa3d99
child 1139 f59038affc7e
     1.1 --- a/src/test/dijkstra_heap_test.cc	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/test/dijkstra_heap_test.cc	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -73,11 +73,11 @@
     1.4  
     1.5    EdgeIt e;
     1.6    for(G.first(e); e!=INVALID; ++e) {
     1.7 -    Node u=G.tail(e);
     1.8 -    Node v=G.head(e);
     1.9 +    Node u=G.source(e);
    1.10 +    Node v=G.target(e);
    1.11      if ( dijkstra_test.dist(v) - dijkstra_test.dist(u) > cap[e] )
    1.12        if ( dijkstra_test.reached(u) ) {
    1.13 -	std::cout<<"Error! dist(head)-dist(tail)- edge_length= " 
    1.14 +	std::cout<<"Error! dist(target)-dist(source)- edge_length= " 
    1.15  		 <<dijkstra_test.dist(v) - dijkstra_test.dist(u) 
    1.16  	  - cap[e]<<std::endl;
    1.17  	++error1;
    1.18 @@ -88,7 +88,7 @@
    1.19    for(G.first(v); v!=INVALID; ++v) {
    1.20      if ( dijkstra_test.reached(v) ) {
    1.21        Edge e=dijkstra_test.pred(v);
    1.22 -      Node u=G.tail(e);
    1.23 +      Node u=G.source(e);
    1.24        if ( dijkstra_test.dist(v) - dijkstra_test.dist(u) != cap[e] ) {
    1.25  	std::cout<<"Error in a shortest path tree edge! Difference: " 
    1.26  		 <<std::abs(dijkstra_test.dist(v) - dijkstra_test.dist(u) 
    1.27 @@ -122,11 +122,11 @@
    1.28    error2=0;
    1.29  
    1.30    for(G.first(e); e!=INVALID; ++e) {
    1.31 -    Node u=G.tail(e);
    1.32 -    Node v=G.head(e);
    1.33 +    Node u=G.source(e);
    1.34 +    Node v=G.target(e);
    1.35      if ( dijkstra_test2.dist(v) - dijkstra_test2.dist(u) > cap[e] )
    1.36        if ( dijkstra_test2.reached(u) ) {
    1.37 -	std::cout<<"Error! dist(head)-dist(tail)- edge_length= " 
    1.38 +	std::cout<<"Error! dist(target)-dist(source)- edge_length= " 
    1.39  		 <<dijkstra_test2.dist(v) - dijkstra_test2.dist(u) 
    1.40  	  - cap[e]<<std::endl;
    1.41  	++error1;
    1.42 @@ -136,7 +136,7 @@
    1.43    for(G.first(v); v!=INVALID; ++v) {
    1.44      if ( dijkstra_test2.reached(v) ) {
    1.45        Edge e=dijkstra_test2.pred(v);
    1.46 -      Node u=G.tail(e);
    1.47 +      Node u=G.source(e);
    1.48        if ( dijkstra_test2.dist(v) - dijkstra_test2.dist(u) != cap[e] ) {
    1.49  	std::cout<<"Error in a shortest path tree edge! Difference: " 
    1.50  		 <<std::abs(dijkstra_test2.dist(v) - dijkstra_test2.dist(u)