Changeset 277 for trunk/CbcStrategy.cpp


Ignore:
Timestamp:
Mar 16, 2006 2:18:04 PM (14 years ago)
Author:
lou
Message:

Revise cbc build process for better control of solvers included in build
(COIN_USE_XXX -> CBC_USE_XXX). Add CbcEventHandler? for independence from
clp.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcStrategy.cpp

    r271 r277  
    1010
    1111#include "OsiSolverInterface.hpp"
    12 #ifdef COIN_USE_CLP
     12#ifdef CBC_USE_CLP
    1313#include "OsiClpSolverInterface.hpp"
    1414#endif
     
    298298    OsiSolverInterface * solver = model.solver();
    299299    int logLevel = model.messageHandler()->logLevel();
    300 #ifdef COIN_USE_CLP
     300#ifdef CBC_USE_CLP
    301301    OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver);
    302302    ClpSimplex * lpSolver=NULL;
     
    342342    } else {
    343343      // now tighten bounds
    344 #ifdef COIN_USE_CLP
     344#ifdef CBC_USE_CLP
    345345      if (clpSolver) {
    346346        // model has changed
Note: See TracChangeset for help on using the changeset viewer.