Changeset 1739


Ignore:
Timestamp:
Nov 25, 2010 5:40:19 PM (9 years ago)
Author:
stefan
Message:

COIN_HAS_CLP and COIN_HAS_IPOPT do not exist anymore, and cannot build Bonmin without them anyway

Location:
branches/split/Bonmin/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveMIP.cpp

    r1728 r1739  
    1919#endif
    2020
    21 #ifdef COIN_HAS_CLP
    2221#include "OsiClpSolverInterface.hpp"
    23 #endif
    2422
    2523#include "OsiAuxInfo.hpp"
  • branches/split/Bonmin/src/Interfaces/BonCurvatureEstimator.cpp

    r1737 r1739  
    137137    }
    138138    else if (linear_solver=="mumps") {
    139 #ifdef HAVE_MUMPS
     139#ifdef COIN_HAS_MUMPS
    140140      SolverInterface1 = new MumpsSolverInterface();
    141141      SolverInterface2 = new MumpsSolverInterface();
  • branches/split/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r1731 r1739  
    257257    FilterSolver::RegisterOptions(roptions);
    258258#endif
    259 #ifdef COIN_HAS_IPOPT
    260259    IpoptSolver::RegisterOptions(roptions);
    261 #endif
    262260  }   
    263261  catch(RegisteredOptions::OPTION_ALREADY_REGISTERED) {
     
    442440#endif   
    443441
    444 #ifdef COIN_HAS_IPOPT
    445442   debug_apps_.push_back(new IpoptSolver(roptions, options, journalist, prefix));
    446 #endif
    447443  }
    448444  else if(s == EIpopt){
    449445    testOthers_ = false;
    450 #ifdef COIN_HAS_IPOPT
    451446    app_ = new IpoptSolver(roptions, options, journalist, prefix);
    452 #else
    453    throw SimpleError("createApplication",
    454                      "Bonmin not configured to run with Ipopt.");
    455 #endif
     447
    456448#ifdef COIN_HAS_FILTERSQP
    457449    debug_apps_.push_back(new Bonmin::FilterSolver(roptions, options, journalist, prefix));
     
    465457                     "Bonmin not configured to run with Ipopt.");
    466458#endif
    467 #ifdef COIN_HAS_IPOPT
    468459   debug_apps_.push_back(new IpoptSolver(roptions, options, journalist, prefix));
    469 #endif
    470460    testOthers_ = true;
    471461  }
  • branches/split/Bonmin/src/Interfaces/BonminConfig.h

    r1 r1739  
    4949#define COIN_HAS_ASL 1
    5050
    51 /* If defined, the BLAS Library is available. */
    52 #define COIN_HAS_BLAS 1
    53 
    5451/* Define to 1 if the Ipopt package is used */
    5552#define COIN_HAS_BONMIN 1
    56 
    57 /* If defined, the LAPACK Library is available. */
    58 #define COIN_HAS_LAPACK 1
    5953
    6054/* Define to 1 if MA27 is available */
     
    6862
    6963/* Define to 1 if MUMPS is available */
    70 /* #undef HAVE_MUMPS */
     64/* #undef COIN_HAS_MUMPS */
    7165
    7266/* Define to 1 if Pardiso is available */
Note: See TracChangeset for help on using the changeset viewer.