Changeset 2471:ed70b226cc48 in lemon-0.x for lemon/capacity_scaling.h

Timestamp:

09/14/07 00:06:54 (17 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

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

Message:

Small changes in min. cost flow algorithms.

File:

• lemon/capacity_scaling.h (modified) (3 diffs)

lemon/capacity_scaling.h

@@ -31 +31 @@
 
 #define WITH_SCALING
+
+#ifdef WITH_SCALING
+#define SCALING_FACTOR    2
+#endif
 
 //#define _DEBUG_ITER_
@@ -543 +547 @@
       }
       if (max_dem < max_sup) max_sup = max_dem;
-      for (delta = 1; 2 * delta < max_sup; delta *= 2) ;
+      for ( delta = 1; SCALING_FACTOR * delta < max_sup;
+            delta *= SCALING_FACTOR ) ;
 #endif
       return true;
@@ -560 +565 @@
       // Processing capacity scaling phases
       ResNode s, t;
-      for ( ; delta >= 1; delta = delta < 4 && delta > 1 ?
-                                  1 : delta / 4 )
+      for ( ; delta >= 1; delta = delta < SCALING_FACTOR && delta > 1 ?
+                                  1 : delta / SCALING_FACTOR )
       {
         // Saturating edges not satisfying the optimality condition