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

    r1387 r1393  
    296296    if (!found)
    297297        model.addHeuristic(&heuristic1);
    298 #if 0
     298#ifdef JJF_ZERO
    299299    // Allow join solutions
    300300    CbcHeuristicLocal heuristic2(model);
     
    863863            model.addCutGenerator(&mixedGen, setting, "MixedIntegerRounding2");
    864864    }
    865 #if 0
     865#ifdef JJF_ZERO
    866866    // Say we want timings
    867867    int newNumberGenerators = model.numberCutGenerators();
     
    952952            cglProbing->setRowCuts(3);
    953953        }
    954 #if 0
     954#ifdef JJF_ZERO
    955955        CglGomory * cglGomory = dynamic_cast<CglGomory *>(generator);
    956956        if (cglGomory) {
Note: See TracChangeset for help on using the changeset viewer.