1.1 --- a/src/test/dijkstra_heap_test.cc	Mon Apr 26 16:58:14 2004 +0000
     1.2 +++ b/src/test/dijkstra_heap_test.cc	Mon Apr 26 17:05:22 2004 +0000
     1.3 @@ -3,8 +3,8 @@
     1.4  //Fibonacci heap of fib_heap.h.
     1.5  
     1.6  //The input is a graph in standard dimacs format from the standard input (like
     1.7 -//in /hugo_loc/testfiles/dimacs). It runs dijkstra.h on this graph with
     1.8 -//both heaps, checking two postconditions: 
     1.9 +//in /hugo_loc/testfiles/dimacs). It runs dijkstra.h on this graph with both
    1.10 +//heaps, checking two postconditions:
    1.11  
    1.12  //- if the edges e=uv of the shortest path tree reported by dijkstra.h have
    1.13  //dist(v)-dist(u)=length(e)
    1.14 @@ -20,7 +20,6 @@
    1.15  #include <time_measure.h>
    1.16  #include <bin_heap.h>
    1.17  #include <fib_heap.h>
    1.18 -#include <for_each_macros.h>
    1.19  
    1.20  using namespace hugo;
    1.21  
    1.22 @@ -56,7 +55,7 @@
    1.23    int error1=0;
    1.24    int error2=0;
    1.25  
    1.26 -  FOR_EACH_LOC ( EdgeIt, e, G) {
    1.27 +  for(EdgeIt e=G.first(e); G.valid(e); G.next(e)) {
    1.28      Node u=G.tail(e);
    1.29      Node v=G.head(e);
    1.30      if ( dijkstra_test.dist(v) - dijkstra_test.dist(u) > cap[e] )
    1.31 @@ -68,7 +67,7 @@
    1.32        }
    1.33    }
    1.34  
    1.35 -  FOR_EACH_LOC ( NodeIt, v, G) {
    1.36 +  for(NodeIt v=G.first(v); G.valid(v); G.next(v)) {
    1.37      if ( dijkstra_test.reached(v) ) {
    1.38        Edge e=dijkstra_test.pred(v);
    1.39        Node u=G.tail(e);
    1.40 @@ -104,7 +103,7 @@
    1.41    error1=0;
    1.42    error2=0;
    1.43  
    1.44 -  FOR_EACH_LOC ( EdgeIt, e, G) {
    1.45 +  for(EdgeIt e=G.first(e); G.valid(e); G.next(e)) {
    1.46      Node u=G.tail(e);
    1.47      Node v=G.head(e);
    1.48      if ( dijkstra_test2.dist(v) - dijkstra_test2.dist(u) > cap[e] )
    1.49 @@ -116,7 +115,7 @@
    1.50        }
    1.51    }
    1.52  
    1.53 -  FOR_EACH_LOC ( NodeIt, v, G) {
    1.54 +  for(NodeIt v=G.first(v); G.valid(v); G.next(v)) {
    1.55      if ( dijkstra_test2.reached(v) ) {
    1.56        Edge e=dijkstra_test2.pred(v);
    1.57        Node u=G.tail(e);