Ignore:
Timestamp:
Nov 28, 2009 6:09:56 AM (10 years ago)
Author:
forrest
Message:

final changes before cleaning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcHeuristicDive.cpp

    r1286 r1315  
    3434    maxTime_ = 600;
    3535    whereFrom_ = 255 - 2 - 16 + 256;
     36    decayFactor_ = 1.0;
    3637}
    3738
     
    5960    maxTime_ = 600;
    6061    whereFrom_ = 255 - 2 - 16 + 256;
     62    decayFactor_ = 1.0;
    6163}
    6264
     
    485487#ifdef GAP
    486488            int nLeft = maxNumberAtBoundToFix - numberAtBoundFixed;
    487 #ifdef CLP_INVESTIGATE
     489#ifdef CLP_INVESTIGATE4
    488490            printf("cutoff %g obj %g nover %d - %d free, %d fixed\n",
    489491                   cutoff, solver->getObjValue(), nOverGap, numberFree, numberFixed);
     
    494496            }
    495497#else
    496 #ifdef CLP_INVESTIGATE
     498#ifdef CLP_INVESTIGATE4
    497499            printf("cutoff %g obj %g - %d free, %d fixed\n",
    498500                   model_->getCutoff(), solver->getObjValue(), numberFree, numberFixed);
     
    10491051#ifdef GAP
    10501052    int nLeft = maxNumberToFix - numberFixedAlready;
    1051 #ifdef CLP_INVESTIGATE
     1053#ifdef CLP_INVESTIGATE4
    10521054    printf("cutoff %g obj %g nover %d - %d free, %d fixed\n",
    10531055           cutoff, solver->getObjValue(), nOverGap, numberFree,
     
    10591061    }
    10601062#else
    1061 #ifdef CLP_INVESTIGATE
     1063#ifdef CLP_INVESTIGATE4
    10621064    printf("cutoff %g obj %g - %d free, %d fixed\n",
    10631065           model_->getCutoff(), solver->getObjValue(), numberFree,
Note: See TracChangeset for help on using the changeset viewer.