Ignore:
Timestamp:
Dec 10, 2009 7:29:38 PM (10 years ago)
Author:
lou
Message:

Mark #if 0 with JJF_ZERO and #if 1 with JJF_ONE as a historical reference
point.

File:
1 edited

Legend:

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

    r1357 r1393  
    270270        return false;
    271271    // No longer used for original purpose - so use for ever run at all JJF
    272 #if 1
     272#ifndef JJF_ONE
    273273    // Don't run if hot start
    274274    if (model_ && model_->hotstartSolution())
     
    277277        return true;
    278278#else
    279 #if 0
     279#ifdef JJF_ZERO
    280280    const CbcNode* currentNode = model_->currentNode();
    281281    if (currentNode == NULL) {
     
    309309        // LL: should we save these nodes in the list of nodes where the heur was
    310310        // LL: run?
    311 #if 1
     311#ifndef JJF_ONE
    312312        if (currentNode != NULL) {
    313313            // Get where we are and create the appropriate CbcHeuristicNode object
     
    334334        CbcHeuristicNode* nodeDesc = new CbcHeuristicNode(*model_);
    335335        //#ifdef PRINT_DEBUG
    336 #if 1
     336#ifndef JJF_ONE
    337337        const double minDistanceToRun = 1.5 * log((double)depth) / log((double)2);
    338338#else
     
    23182318#ifdef NEW_ROUNDING
    23192319    if (!returnCode) {
    2320 #if 0
     2320#ifdef JJF_ZERO
    23212321        // back to starting point
    23222322        memcpy(newSolution, solution, numberColumns*sizeof(double));
Note: See TracChangeset for help on using the changeset viewer.