Ignore:
Timestamp:
May 26, 2013 5:11:16 AM (7 years ago)
Author:
stefan
Message:

please don't set SCIP LP solver (global variable) in library, but let user set it in advance, so set in main program

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenne.cpp

    r961 r963  
    5252#endif
    5353
    54 // #ifdef COIN_HAS_SCIP
    55 // #include "lpiswitch.h"
    56 // #endif
     54#ifdef COIN_HAS_SCIP
     55#include "lpiswitch.h"
     56#endif
    5757
    5858#include "CoinSignal.hpp"
     
    9595  using namespace Ipopt;
    9696
    97 // #ifdef COIN_HAS_SCIP
    98 //   SCIPlpiSwitchSetDefaultSolver();
    99 // #endif
     97#ifdef COIN_HAS_SCIP
     98  SCIPlpiSwitchSetSolver(SCIP_LPISW_CLP);
     99#endif
    100100
    101101  char * pbName = NULL;
Note: See TracChangeset for help on using the changeset viewer.