# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1300349798 -3600
# Node ID 4e36fdf856b7e1c4875140cbcf361af178be3665
# Parent  7f37e5fc416ed99223fc9a0a6f97131e09c1aee4# Parent  f112c18bc304761d339c4ffc4976bba5ca348da6
Merge bugfix in #417 to branch 1.2

diff -r 7f37e5fc416e -r 4e36fdf856b7 lemon/cost_scaling.h
--- a/lemon/cost_scaling.h	Fri Mar 04 11:38:05 2011 +0100
+++ b/lemon/cost_scaling.h	Thu Mar 17 09:16:38 2011 +0100
@@ -907,7 +907,7 @@
           startPush();
           break;
         case AUGMENT:
-          startAugment();
+          startAugment(_res_node_num - 1);
           break;
         case PARTIAL_AUGMENT:
           startAugment(MAX_PATH_LENGTH);
@@ -1084,7 +1084,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;