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/CbcHeuristic.cpp

    r1286 r1315  
    374374            3 only at root and if no solution
    375375            4 only at root and if this heuristic has not got solution
    376             5 only at depth <4
     376            5 as 3 but decay more
    377377            6 decay
    378378            7 run up to 2 times if solution found 4 otherwise
     
    389389                break;
    390390            case 5:
    391                 if (depth >= 4)
     391                assert (decayFactor_);
     392                if (model_->bestSolution()) {
    392393                    probability = -1.0;
     394                } else if (numCouldRun_ > 1000) {
     395                    decayFactor_ *= 0.99;
     396                    probability *= decayFactor_;
     397                }
    393398                break;
    394399            case 6:
     
    399404                        int old = howOften_;
    400405#endif
    401                         howOften_ = CoinMin(CoinMax(static_cast<int> (howOften_ * 1.1), howOften_ + 1), 10000);
     406                        howOften_ = CoinMin(CoinMax(static_cast<int> (howOften_ * 1.1), howOften_ + 1), 1000000);
    402407#ifdef COIN_DEVELOP
    403408                        printf("Howoften changed from %d to %d for %s\n",
     
    15321537    up_ = NULL;
    15331538    equal_ = NULL;
     1539    //whereFrom_ |= 16; // allow more often
    15341540}
    15351541
     
    15491555    equal_ = NULL;
    15501556    seed_ = 7654321;
     1557    //whereFrom_ |= 16; // allow more often
    15511558}
    15521559
Note: See TracChangeset for help on using the changeset viewer.