[Lemon-commits] Alpar Juttner: Merge #417

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/773dd96ecdd8
changeset: 1042:773dd96ecdd8
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Thu Mar 17 09:02:51 2011 +0100
description:
	Merge #417

diffstat:

 lemon/cost_scaling.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff --git a/lemon/cost_scaling.h b/lemon/cost_scaling.h
--- a/lemon/cost_scaling.h
+++ b/lemon/cost_scaling.h
@@ -911,7 +911,7 @@
           startPush();
           break;
         case AUGMENT:
-          startAugment();
+          startAugment(_res_node_num - 1);
           break;
         case PARTIAL_AUGMENT:
           startAugment(MAX_PATH_LENGTH);
@@ -1088,7 +1088,7 @@
     }
 
     /// Execute the algorithm performing augment and relabel operations
-    void startAugment(int max_length = std::numeric_limits<int>::max()) {
+    void startAugment(int max_length) {
       // Paramters for heuristics
       const int EARLY_TERM_EPSILON_LIMIT = 1000;
       const double GLOBAL_UPDATE_FACTOR = 3.0;