Merge #417
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 17 Mar 2011 09:02:51 +0100
changeset 932773dd96ecdd8
parent 930 8e39ccaabf48
parent 931 f112c18bc304
child 934 fe283caf6414
Merge #417
lemon/cost_scaling.h
     1.1 --- a/lemon/cost_scaling.h	Fri Mar 04 12:18:38 2011 +0100
     1.2 +++ b/lemon/cost_scaling.h	Thu Mar 17 09:02:51 2011 +0100
     1.3 @@ -911,7 +911,7 @@
     1.4            startPush();
     1.5            break;
     1.6          case AUGMENT:
     1.7 -          startAugment();
     1.8 +          startAugment(_res_node_num - 1);
     1.9            break;
    1.10          case PARTIAL_AUGMENT:
    1.11            startAugment(MAX_PATH_LENGTH);
    1.12 @@ -1088,7 +1088,7 @@
    1.13      }
    1.14  
    1.15      /// Execute the algorithm performing augment and relabel operations
    1.16 -    void startAugment(int max_length = std::numeric_limits<int>::max()) {
    1.17 +    void startAugment(int max_length) {
    1.18        // Paramters for heuristics
    1.19        const int EARLY_TERM_EPSILON_LIMIT = 1000;
    1.20        const double GLOBAL_UPDATE_FACTOR = 3.0;