Changeset 836 for trunk

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:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/CbcGenSolvers.cpp (modified) (2 diffs)

trunk/Cbc/configure

@@ -21117 +21117 @@
 # header file, but that's not assumed.
 
-    if test -r $MSKINCDIR/mosekdl.h; then
+    if test -r $MSKINCDIR/mosek.h; then
 
   :
 else
-  { { echo "$as_me:$LINENO: error: Cannot find file mosekdl.h in $MSKINCDIR" >&5
-echo "$as_me: error: Cannot find file mosekdl.h in $MSKINCDIR" >&2;}
+  { { echo "$as_me:$LINENO: error: Cannot find file mosek.h in $MSKINCDIR" >&5
+echo "$as_me: error: Cannot find file mosek.h in $MSKINCDIR" >&2;}
    { (exit 1); exit 1; }; }
   :

trunk/Cbc/configure.ac

@@ -73 +73 @@
 AC_COIN_HAS_USER_LIBRARY([Cplex],[CPX],[cplex.h],[CPXgetstat])
 AC_COIN_HAS_USER_LIBRARY([FortMP],[FMP])  #ToDo! is Fortran?
-AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosekdl.h],[MSK_openmosek])
+AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosek.h],[MSK_openmosek])
 AC_COIN_HAS_USER_LIBRARY([Osl],[OSL],[ekk_c_api.h],[ekk_simplex])
 AC_COIN_HAS_USER_LIBRARY([Soplex],[SPX],[spxsolver.h]) # ToDo

trunk/Cbc/src/CbcGenSolvers.cpp

@@ -50 +50 @@
 #endif
 
+#ifdef COIN_HAS_MSK
+# include "OsiMskSolverInterface.hpp"
+# ifndef CBC_DEFAULT_SOLVER
+#   define CBC_DEFAULT_SOLVER "msk"
+# endif
+#endif
+
 #include "CoinParam.hpp"
 
@@ -115 +122 @@
 # ifdef COIN_HAS_GLPK
   solvers["glpk"] = new OsiGlpkSolverInterface  ;
+# endif
+# ifdef COIN_HAS_MSK
+  solvers["msk"] = new OsiMskSolverInterface  ;
 # endif
 /*