Changeset 961


Ignore:
Timestamp:
May 24, 2013 1:05:10 PM (7 years ago)
Author:
pbelotti
Message:

compiling to use SCIP without error

Location:
trunk/Couenne/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/heuristics/CouenneFPFindSolution.cpp

    r941 r961  
    8282  {
    8383
     84    milp_ -> messageHandler () -> setLogLevel (0);
     85
    8486     if (problem_ -> nIntVars () > 0) milp_ -> branchAndBound ();
    8587     else                             milp_ -> initialSolve ();
  • trunk/Couenne/src/heuristics/CouenneFPscipSolve.cpp

    r900 r961  
    8989
    9090  // initialize SCIP
    91   SCIP_CALL( SCIPcreate(&scip) );
     91  SCIP_CALL( SCIPcreate (&scip) );
    9292  assert(scip != NULL);
    93 
    9493   
    9594  // include default SCIP plugins
  • trunk/Couenne/src/heuristics/CouenneFeasPumpConstructors.cpp

    r898 r961  
    2525#include "CouenneSparseMatrix.hpp"
    2626
     27#include "lpiswitch.h"
     28
    2729using namespace Ipopt;
    2830using namespace Couenne;
     
    138140    if (milpMethod_ < 0)
    139141      milpMethod_ = 0;
     142    SCIPlpiSwitchSetSolver (SCIP_LPISW_CLP);
     143    //    SCIPlpiSwitchSetDefaultSolver ();
    140144#else
    141145    if (s == "yes")
  • trunk/Couenne/src/main/BonCouenne.cpp

    r959 r961  
    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//   SCIPlpiSwitchSetDefaultSolver();
     99// #endif
    100100
    101101  char * pbName = NULL;
Note: See TracChangeset for help on using the changeset viewer.