Changeset 422:ede61a3d229b in lemon-0.x for src/test/dijkstra_heap_test.cc

Timestamp:

04/26/04 19:05:22 (21 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@562

Message:

macro erase

File:

• src/test/dijkstra_heap_test.cc (modified) (6 diffs)

src/test/dijkstra_heap_test.cc

@@ -4 +4 @@
 
 //The input is a graph in standard dimacs format from the standard input (like
-//in /hugo_loc/testfiles/dimacs). It runs dijkstra.h on this graph with
-//both heaps, checking two postconditions: 
+//in /hugo_loc/testfiles/dimacs). It runs dijkstra.h on this graph with both
+//heaps, checking two postconditions:
 
 //- if the edges e=uv of the shortest path tree reported by dijkstra.h have
@@ -21 +21 @@
 #include <bin_heap.h>
 #include <fib_heap.h>
-#include <for_each_macros.h>
 
 using namespace hugo;
@@ -57 +56 @@
   int error2=0;
 
-  FOR_EACH_LOC ( EdgeIt, e, G) {
+  for(EdgeIt e=G.first(e); G.valid(e); G.next(e)) {
     Node u=G.tail(e);
     Node v=G.head(e);
@@ -69 +68 @@
   }
 
-  FOR_EACH_LOC ( NodeIt, v, G) {
+  for(NodeIt v=G.first(v); G.valid(v); G.next(v)) {
     if ( dijkstra_test.reached(v) ) {
       Edge e=dijkstra_test.pred(v);
@@ -105 +104 @@
   error2=0;
 
-  FOR_EACH_LOC ( EdgeIt, e, G) {
+  for(EdgeIt e=G.first(e); G.valid(e); G.next(e)) {
     Node u=G.tail(e);
     Node v=G.head(e);
@@ -117 +116 @@
   }
 
-  FOR_EACH_LOC ( NodeIt, v, G) {
+  for(NodeIt v=G.first(v); G.valid(v); G.next(v)) {
     if ( dijkstra_test2.reached(v) ) {
       Edge e=dijkstra_test2.pred(v);