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

    r1386 r1393  
    4545crunchIt(ClpSimplex * model)
    4646{
    47 #if 0
     47#ifdef JJF_ZERO
    4848    model->dual();
    4949#else
     
    11371137                 int numberParameters_,int noPrinting_,int initialPumpTune)
    11381138{
    1139 #if 0 //NEW_STYLE_SOLVER==0
     1139#ifdef JJF_ZERO //NEW_STYLE_SOLVER==0
    11401140    CbcOrClpParam * parameters_ = parameters;
    11411141    int numberParameters_ = numberParameters;
     
    13551355    }
    13561356    if (useRENS >= kType && useRENS <= kType + 1) {
    1357 #if 1
     1357#ifndef JJF_ONE
    13581358        CbcHeuristicRENS heuristic6(*model);
    13591359        heuristic6.setHeuristicName("RENS");
     
    14771477        anyToDo = true;
    14781478    }
    1479 #if 0
     1479#ifdef JJF_ZERO
    14801480    if (usePivotC >= type && usePivotC <= kType + 1) {
    14811481        CbcHeuristicPivotAndComplement heuristic(*model);
     
    15521552    if (type == 2 && anyToDo) {
    15531553        // Do heuristics
    1554 #if 1
     1554#ifndef JJF_ONE
    15551555        // clean copy
    15561556        CbcModel model2(*model);
Note: See TracChangeset for help on using the changeset viewer.