Changeset 1826 for trunk/Cbc/src


Ignore:
Timestamp:
Dec 3, 2012 12:30:04 PM (7 years ago)
Author:
stefan
Message:

remove ifdef for KEEP_POSTPROCESS, its always on in Cgl trunk and 0.58

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcSolver.cpp

    r1819 r1826  
    295295    return *this;
    296296}
    297 #ifdef KEEP_POSTPROCESS
     297
    298298static void putBackOtherSolutions(CbcModel * presolvedModel, CbcModel * model,
    299299                           CglPreProcess * preProcess)
     
    319319  }
    320320}
    321 #endif
    322321
    323322/*
     
    59225921                                    lpSolver->setSpecialOptions(lpSolver->specialOptions() | IN_BRANCH_AND_BOUND); // say is Cbc (and in branch and bound)
    59235922#endif
    5924 #ifdef KEEP_POSTPROCESS
    5925                                     // put back any saved solutions
    5926                                     putBackOtherSolutions(babModel_,&model_,&process);
    5927 #endif
     5923                                    // put back any saved solutions
     5924                                    putBackOtherSolutions(babModel_,&model_,&process);
    59285925                                    process.postProcess(*babModel_->solver());
    59295926#ifdef COIN_DEVELOP
Note: See TracChangeset for help on using the changeset viewer.