Changeset 836 for trunk/Cbc/src/CbcGenSolvers.cpp

Timestamp:

Dec 5, 2007 9:59:34 PM (14 years ago)

Author:

lou

Message:

Updates to match OsiMsk? updates, Osi r1140.

File:

• trunk/Cbc/src/CbcGenSolvers.cpp (modified) (2 diffs)

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
 /*