1.1 --- a/src/hugo/mincostflows.h	Tue Aug 31 11:26:59 2004 +0000
     1.2 +++ b/src/hugo/mincostflows.h	Tue Aug 31 13:40:07 2004 +0000
     1.3 @@ -116,12 +116,12 @@
     1.4        //Resetting variables from previous runs
     1.5        total_length = 0;
     1.6        
     1.7 -      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
     1.8 +      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
     1.9  	flow.set(e,0);
    1.10        }
    1.11  
    1.12        //Initialize the potential to zero
    1.13 -      FOR_EACH_LOC(typename Graph::NodeIt, n, G){
    1.14 +      for(typename Graph::NodeIt n=loopFirst(typename Graph::NodeIt(), (G)); n!=INVALID; ++n){
    1.15  	potential.set(n,0);
    1.16        }
    1.17        
    1.18 @@ -144,7 +144,9 @@
    1.19  	};
    1.20  	
    1.21  	//We have to change the potential
    1.22 -	FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
    1.23 +        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
    1.24 +	//FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
    1.25 +        for(typename ResGraphType::NodeIt n=loopFirst(typename ResGraphType::NodeIt(), (res_graph)); n!=INVALID; ++n){
    1.26  	  potential[n] += dijkstra.distMap()[n];
    1.27  	}
    1.28  
    1.29 @@ -195,7 +197,9 @@
    1.30      bool checkComplementarySlackness(){
    1.31        Length mod_pot;
    1.32        Length fl_e;
    1.33 -      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
    1.34 +        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
    1.35 +        //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
    1.36 +        for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
    1.37  	//C^{\Pi}_{i,j}
    1.38  	mod_pot = length[e]-potential[G.head(e)]+potential[G.tail(e)];
    1.39  	fl_e = flow[e];