Changeset 836 for trunk


Ignore:
Timestamp:
Dec 5, 2007 9:59:34 PM (12 years ago)
Author:
lou
Message:

Updates to match OsiMsk? updates, Osi r1140.

Location:
trunk/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r835 r836  
    2111721117# header file, but that's not assumed.
    2111821118
    21119     if test -r $MSKINCDIR/mosekdl.h; then
     21119    if test -r $MSKINCDIR/mosek.h; then
    2112021120
    2112121121  :
    2112221122else
    21123   { { echo "$as_me:$LINENO: error: Cannot find file mosekdl.h in $MSKINCDIR" >&5
    21124 echo "$as_me: error: Cannot find file mosekdl.h in $MSKINCDIR" >&2;}
     21123  { { echo "$as_me:$LINENO: error: Cannot find file mosek.h in $MSKINCDIR" >&5
     21124echo "$as_me: error: Cannot find file mosek.h in $MSKINCDIR" >&2;}
    2112521125   { (exit 1); exit 1; }; }
    2112621126  :
  • trunk/Cbc/configure.ac

    r765 r836  
    7373AC_COIN_HAS_USER_LIBRARY([Cplex],[CPX],[cplex.h],[CPXgetstat])
    7474AC_COIN_HAS_USER_LIBRARY([FortMP],[FMP])  #ToDo! is Fortran?
    75 AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosekdl.h],[MSK_openmosek])
     75AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosek.h],[MSK_openmosek])
    7676AC_COIN_HAS_USER_LIBRARY([Osl],[OSL],[ekk_c_api.h],[ekk_simplex])
    7777AC_COIN_HAS_USER_LIBRARY([Soplex],[SPX],[spxsolver.h]) # ToDo
  • trunk/Cbc/src/CbcGenSolvers.cpp

    r640 r836  
    5050#endif
    5151
     52#ifdef COIN_HAS_MSK
     53# include "OsiMskSolverInterface.hpp"
     54# ifndef CBC_DEFAULT_SOLVER
     55#   define CBC_DEFAULT_SOLVER "msk"
     56# endif
     57#endif
     58
    5259#include "CoinParam.hpp"
    5360
     
    115122# ifdef COIN_HAS_GLPK
    116123  solvers["glpk"] = new OsiGlpkSolverInterface  ;
     124# endif
     125# ifdef COIN_HAS_MSK
     126  solvers["msk"] = new OsiMskSolverInterface  ;
    117127# endif
    118128/*
Note: See TracChangeset for help on using the changeset viewer.