Ignore:
Timestamp:
Jun 9, 2010 6:25:35 AM (9 years ago)
Author:
stefan
Message:

add (back) option to use SoPlex? as LP solver

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure.ac

    r1464 r1466  
    6868  AC_COIN_HAS_MODULE_FALLBACK(Osi,       [osi],        [../Osi],               [dodefine=0 doconditional=0])
    6969  AC_COIN_HAS_MODULE_FALLBACK(Cgl,       [cgl],        [../Cgl],               [dodefine=0 doconditional=0])
    70   COINDEPEND_LIBS="$COINUTILS_LIBS $BLAS_LIBS $LAPACK_LIBS $GLPK_LIBS $OSI_LIBS $CGL_LIBS"
     70  COINDEPEND_LIBS="$CGL_LIBS $OSI_LIBS $COINUTILS_LIBS $LAPACK_LIBS $BLAS_LIBS $GLPK_LIBS"
    7171  COINDEPEND_CFLAGS="$COINUTILS_CFLAGS $GLPK_CFLAGS $OSI_CFLAGS $CGL_CFLAGS"
    7272  if test "${coin_has_coinutils}${coin_has_osi}${coin_has_cgl}" = yesyesyes ; then
     
    113113AC_COIN_HAS_MODULE(Grb,  [osi-gurobi])
    114114AC_COIN_HAS_MODULE(Msk,  [osi-mosek])
    115 #AC_COIN_HAS_MODULE(Spx,  [osi-soplex])
     115AC_COIN_HAS_MODULE(Spx,  [osi-soplex])
    116116AC_COIN_HAS_MODULE(Xpr,  [osi-xpress])
    117117
     
    156156
    157157case $cbc_default_solver in
    158    clp)
    159     ;;
    160   dylp)
    161     ;;
    162   glpk)
    163     ;;
    164      *)
    165     AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.])
    166     ;;
     158    clp)
     159      ;;
     160   dylp)
     161      ;;
     162   glpk)
     163      ;;
     164 soplex)
     165      ;;
     166      *)
     167      AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.])
     168      ;;
    167169esac
    168170AC_DEFINE_UNQUOTED([CBC_DEFAULT_SOLVER],"$cbc_default_solver",
     
    262264    osi_exists_solver=${coin_has_msk-"unavailable"}
    263265    ;;
     266  @<:@Ss@:>@@<:@Pp@:>@@<:@Xx@:>@*)
     267    osi_lc_solver=spx ;
     268    osi_mc_solver=Spx
     269    osi_uc_solver=SPX
     270    osi_exists_solver=${coin_has_spx-"unavailable"}
     271    ;;
    264272  @<:@Ss@:>@@<:@Yy@:>@@<:@Mm@:>@*)
    265273    osi_lc_solver=sym ;
     
    316324AM_CONDITIONAL([OSICBC_DFLT_SOLVER_GRB],[test $osi_mc_solver = Grb])
    317325AM_CONDITIONAL([OSICBC_DFLT_SOLVER_MSK],[test $osi_mc_solver = Msk])
     326AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SPX],[test $osi_mc_solver = Spx])
    318327AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SYM],[test $osi_mc_solver = Sym])
    319328AM_CONDITIONAL([OSICBC_DFLT_SOLVER_VOL],[test $osi_mc_solver = Vol])
Note: See TracChangeset for help on using the changeset viewer.