Changeset 288


Ignore:
Timestamp:
Mar 27, 2006 6:26:22 PM (13 years ago)
Author:
lou
Message:

Remove CBC_ONLY_CLP build option.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcHeuristic.cpp

    r277 r288  
    5858#ifdef CBC_USE_CLP
    5959  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
    60 # ifndef CBC_ONLY_CLP
    6160  if (osiclp) {
    62 # endif
    6361    // go faster stripes
    6462    if (osiclp->getNumRows()<300&&osiclp->getNumCols()<500) {
     
    7068    // Used to be automatically set
    7169    osiclp->setSpecialOptions(osiclp->specialOptions()|(128+64));
    72 # ifndef CBC_ONLY_CLP
    7370  }
    74 # endif
    7571#endif
    7672  // Reduce printout
  • trunk/Test/CbcMain.cpp

    r277 r288  
    3838
    3939#include "CbcModel.hpp"
     40#include "CbcEventHandler.hpp"
    4041#include "CbcTree.hpp"
    4142#include "CbcCutGenerator.hpp"
     
    12711272#ifdef CBC_USE_CLP
    12721273              OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (model->solver());
    1273 # ifndef CBC_ONLY_CLP
    12741274              if (osiclp) {
    1275 # endif
    12761275                // go faster stripes
    12771276                if (osiclp->getNumRows()<300&&osiclp->getNumCols()<500) {
    12781277                  osiclp->setupForRepeatedUse(2,0);
    12791278                }
    1280 # ifndef CBC_ONLY_CLP
    12811279              }
    1282 # endif
    12831280#endif
    12841281              if (gapRatio < 1.0e100)
Note: See TracChangeset for help on using the changeset viewer.