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

Timestamp:

Jan 16, 2008 7:14:38 PM (14 years ago)

Author:

lou

Message:

Allow use of OsiCpx?, now that Matt's buffing it up a bit.

File:

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

trunk/Cbc/src/CbcGenSolvers.cpp

@@ -36 +36 @@
 #endif
 
+#ifdef COIN_HAS_CPX
+# include "OsiCpxSolverInterface.hpp"
+# ifndef CBC_DEFAULT_SOLVER
+#   define CBC_DEFAULT_SOLVER "cpx"
+# endif
+#endif
+
 #ifdef COIN_HAS_DYLP
 # include "OsiDylpSolverInterface.hpp"
@@ -116 +123 @@
 # ifdef COIN_HAS_CLP
   solvers["clp"] = new OsiClpSolverInterface ;
+# endif
+# ifdef COIN_HAS_CPX
+  solvers["cpx"] = new OsiCpxSolverInterface ;
 # endif
 # ifdef COIN_HAS_DYLP