# HG changeset patch # User Alpar Juttner # Date 1300348971 -3600 # Node ID 773dd96ecdd83703782b1276654ac122d474e8cc # Parent 8e39ccaabf484a72dc36608cb5e954a62a0b984d# Parent f112c18bc304761d339c4ffc4976bba5ca348da6 Merge #417 diff -r 8e39ccaabf48 -r 773dd96ecdd8 lemon/cost_scaling.h --- a/lemon/cost_scaling.h Fri Mar 04 12:18:38 2011 +0100 +++ b/lemon/cost_scaling.h Thu Mar 17 09:02:51 2011 +0100 @@ -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::max()) { + void startAugment(int max_length) { // Paramters for heuristics const int EARLY_TERM_EPSILON_LIMIT = 1000; const double GLOBAL_UPDATE_FACTOR = 3.0;