1.1 --- a/src/work/marci/lg_vs_sg_vs_sg.cc	Tue Aug 31 13:40:07 2004 +0000
     1.2 +++ b/src/work/marci/lg_vs_sg_vs_sg.cc	Tue Aug 31 17:54:22 2004 +0000
     1.3 @@ -53,7 +53,7 @@
     1.4  
     1.5      {
     1.6        std::cout << "physical blocking flow augmentation ..." << std::endl;
     1.7 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     1.8 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     1.9        ts.reset();
    1.10        int i=0;
    1.11        while (augmenting_flow_test.augmentOnBlockingFlow<MutableGraph>()) { ++i; }
    1.12 @@ -75,7 +75,7 @@
    1.13  
    1.14      {
    1.15        std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    1.16 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.17 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.18        ts.reset();
    1.19        int i=0;
    1.20        while (augmenting_flow_test.augmentOnBlockingFlow2()) { ++i; }
    1.21 @@ -86,7 +86,7 @@
    1.22  
    1.23      {
    1.24        std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    1.25 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.26 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.27        ts.reset();
    1.28        int i=0;
    1.29        while (augmenting_flow_test.augmentOnShortestPath()) { ++i; }
    1.30 @@ -121,7 +121,7 @@
    1.31  
    1.32      {
    1.33        std::cout << "preflow ..." << std::endl;
    1.34 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.35 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.36        ts.reset();
    1.37        max_flow_test.run();
    1.38        std::cout << "elapsed time: " << ts << std::endl;
    1.39 @@ -130,7 +130,7 @@
    1.40  
    1.41      {
    1.42        std::cout << "physical blocking flow augmentation ..." << std::endl;
    1.43 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.44 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.45        ts.reset();
    1.46        int i=0;
    1.47        while (augmenting_flow_test.augmentOnBlockingFlow<MutableGraph>()) { ++i; }
    1.48 @@ -152,7 +152,7 @@
    1.49  
    1.50      {
    1.51        std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    1.52 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.53 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.54        ts.reset();
    1.55        int i=0;
    1.56        while (augmenting_flow_test.augmentOnBlockingFlow2()) { ++i; }
    1.57 @@ -163,7 +163,7 @@
    1.58  
    1.59      {
    1.60        std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    1.61 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.62 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.63        ts.reset();
    1.64        int i=0;
    1.65        while (augmenting_flow_test.augmentOnShortestPath()) { ++i; }
    1.66 @@ -198,7 +198,7 @@
    1.67  
    1.68      {
    1.69        std::cout << "preflow ..." << std::endl;
    1.70 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.71 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.72        ts.reset();
    1.73        max_flow_test.run();
    1.74        std::cout << "elapsed time: " << ts << std::endl;
    1.75 @@ -207,7 +207,7 @@
    1.76  
    1.77      {
    1.78        std::cout << "physical blocking flow augmentation ..." << std::endl;
    1.79 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.80 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.81        ts.reset();
    1.82        int i=0;
    1.83        while (augmenting_flow_test.augmentOnBlockingFlow<MutableGraph>()) { ++i; }
    1.84 @@ -229,7 +229,7 @@
    1.85  
    1.86      {
    1.87        std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    1.88 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.89 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.90        ts.reset();
    1.91        int i=0;
    1.92        while (augmenting_flow_test.augmentOnBlockingFlow2()) { ++i; }
    1.93 @@ -240,7 +240,7 @@
    1.94  
    1.95      {
    1.96        std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    1.97 -      FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    1.98 +      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    1.99        ts.reset();
   1.100        int i=0;
   1.101        while (augmenting_flow_test.augmentOnShortestPath()) { ++i; }