Changes in lemon/cbc.cc [1142:4764031c082c:793:e4554cd6b2bf] in lemon

File:

• lemon/cbc.cc (modified) (5 diffs)

lemon/cbc.cc

@@ -26 +26 @@
 #include <coin/OsiSolverInterface.hpp>
 
+#ifdef COIN_HAS_CLP
 #include "coin/OsiClpSolverInterface.hpp"
+#endif
+#ifdef COIN_HAS_OSL
+#include "coin/OsiOslSolverInterface.hpp"
+#endif
 
 #include "coin/CbcCutGenerator.hpp"
@@ -266 +271 @@
       delete _osi_solver;
     }
+#ifdef COIN_HAS_CLP
     _osi_solver = new OsiClpSolverInterface();
+#elif COIN_HAS_OSL
+    _osi_solver = new OsiOslSolverInterface();
+#else
+#error Cannot instantiate Osi solver
+#endif
 
     _osi_solver->loadFromCoinModel(*_prob);
@@ -318 +329 @@
       _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover");
 
+#ifdef COIN_HAS_CLP
       OsiClpSolverInterface* osiclp =
         dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver());
@@ -323 +335 @@
         osiclp->setupForRepeatedUse(2, 0);
       }
+#endif
 
       CbcRounding heuristic1(*_cbc_model);
@@ -436 +449 @@
 
     _prob = new CoinModel();
+    rows.clear();
+    cols.clear();
   }