lemon/capacity_scaling.h
changeset 2471 ed70b226cc48
parent 2457 8c791ee69a45
child 2507 6520edb2c3f3
     1.1 --- a/lemon/capacity_scaling.h	Thu Sep 13 22:05:32 2007 +0000
     1.2 +++ b/lemon/capacity_scaling.h	Thu Sep 13 22:06:54 2007 +0000
     1.3 @@ -31,6 +31,10 @@
     1.4  
     1.5  #define WITH_SCALING
     1.6  
     1.7 +#ifdef WITH_SCALING
     1.8 +#define SCALING_FACTOR	  2
     1.9 +#endif
    1.10 +
    1.11  //#define _DEBUG_ITER_
    1.12  
    1.13  namespace lemon {
    1.14 @@ -542,7 +546,8 @@
    1.15  	if (supply[n] < -max_dem) max_dem = -supply[n];
    1.16        }
    1.17        if (max_dem < max_sup) max_sup = max_dem;
    1.18 -      for (delta = 1; 2 * delta < max_sup; delta *= 2) ;
    1.19 +      for ( delta = 1; SCALING_FACTOR * delta < max_sup;
    1.20 +	    delta *= SCALING_FACTOR ) ;
    1.21  #endif
    1.22        return true;
    1.23      }
    1.24 @@ -559,8 +564,8 @@
    1.25  
    1.26        // Processing capacity scaling phases
    1.27        ResNode s, t;
    1.28 -      for ( ; delta >= 1; delta = delta < 4 && delta > 1 ?
    1.29 -				  1 : delta / 4 )
    1.30 +      for ( ; delta >= 1; delta = delta < SCALING_FACTOR && delta > 1 ?
    1.31 +				  1 : delta / SCALING_FACTOR )
    1.32        {
    1.33  	// Saturating edges not satisfying the optimality condition
    1.34  	Capacity r;