Changeset 1466 for trunk/Cbc/configure.ac

Timestamp:

Jun 9, 2010 6:25:35 AM (9 years ago)

Author:

stefan

Message:

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

File:

• trunk/Cbc/configure.ac (modified) (5 diffs)

trunk/Cbc/configure.ac

@@ -68 +68 @@
   AC_COIN_HAS_MODULE_FALLBACK(Osi,       [osi],        [../Osi],               [dodefine=0 doconditional=0])
   AC_COIN_HAS_MODULE_FALLBACK(Cgl,       [cgl],        [../Cgl],               [dodefine=0 doconditional=0])
-  COINDEPEND_LIBS="$COINUTILS_LIBS $BLAS_LIBS $LAPACK_LIBS $GLPK_LIBS $OSI_LIBS $CGL_LIBS"
+  COINDEPEND_LIBS="$CGL_LIBS $OSI_LIBS $COINUTILS_LIBS $LAPACK_LIBS $BLAS_LIBS $GLPK_LIBS"
   COINDEPEND_CFLAGS="$COINUTILS_CFLAGS $GLPK_CFLAGS $OSI_CFLAGS $CGL_CFLAGS"
   if test "${coin_has_coinutils}${coin_has_osi}${coin_has_cgl}" = yesyesyes ; then
@@ -113 +113 @@
 AC_COIN_HAS_MODULE(Grb,  [osi-gurobi])
 AC_COIN_HAS_MODULE(Msk,  [osi-mosek])
-#AC_COIN_HAS_MODULE(Spx,  [osi-soplex])
+AC_COIN_HAS_MODULE(Spx,  [osi-soplex])
 AC_COIN_HAS_MODULE(Xpr,  [osi-xpress])
 
@@ -156 +156 @@
 
 case $cbc_default_solver in
-   clp)
-    ;;
-  dylp)
-    ;;
-  glpk)
-    ;;
-     *)
-    AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.])
-    ;;
+    clp)
+      ;;
+   dylp)
+      ;;
+   glpk)
+      ;;
+ soplex)
+      ;;
+      *)
+      AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.])
+      ;;
 esac
 AC_DEFINE_UNQUOTED([CBC_DEFAULT_SOLVER],"$cbc_default_solver",
@@ -262 +264 @@
     osi_exists_solver=${coin_has_msk-"unavailable"}
     ;;
+  @<:@Ss@:>@@<:@Pp@:>@@<:@Xx@:>@*)
+    osi_lc_solver=spx ;
+    osi_mc_solver=Spx
+    osi_uc_solver=SPX
+    osi_exists_solver=${coin_has_spx-"unavailable"}
+    ;;
   @<:@Ss@:>@@<:@Yy@:>@@<:@Mm@:>@*)
     osi_lc_solver=sym ;
@@ -316 +324 @@
 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_GRB],[test $osi_mc_solver = Grb])
 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_MSK],[test $osi_mc_solver = Msk])
+AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SPX],[test $osi_mc_solver = Spx])
 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SYM],[test $osi_mc_solver = Sym])
 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_VOL],[test $osi_mc_solver = Vol])