Changeset 567:3314f58e7b25 in lemon-main

Timestamp:

04/01/09 22:58:58 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Add CBC support (#204)

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• lemon/Makefile.am (modified) (4 diffs)
• lemon/cbc.cc (added)
• lemon/cbc.h (added)
• lemon/config.h.in (modified) (1 diff)
• m4/lx_check_cbc.m4 (added)
• test/mip_test.cc (modified) (8 diffs)

Makefile.am

@@ -12 +12 @@
         m4/lx_check_glpk.m4 \
         m4/lx_check_soplex.m4 \
+        m4/lx_check_clp.m4 \
+        m4/lx_check_cbc.m4 \
         CMakeLists.txt \
         cmake/FindGhostscript.cmake \

configure.ac

@@ -61 +61 @@
 LX_CHECK_SOPLEX
 LX_CHECK_CLP
+LX_CHECK_CBC
 
 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
@@ -120 +121 @@
 echo SOPLEX support................ : $lx_soplex_found
 echo CLP support................... : $lx_clp_found
+echo CBC support................... : $lx_cbc_found
 echo
 echo Build additional tools........ : $enable_tools

lemon/Makefile.am

@@ -13 +13 @@
         lemon/lp_base.cc \
         lemon/lp_skeleton.cc \
-        lemon/random.cc \
+        lemon/random.cc \
         lemon/bits/windows.cc
 
@@ -22 +22 @@
         $(CPLEX_CFLAGS) \
         $(SOPLEX_CXXFLAGS) \
-        $(CLP_CXXFLAGS)
+        $(CLP_CXXFLAGS) \
+        $(CBC_CXXFLAGS)
 
 lemon_libemon_la_LDFLAGS = \
@@ -28 +29 @@
         $(CPLEX_LIBS) \
         $(SOPLEX_LIBS) \
-        $(CLP_LIBS)
+        $(CLP_LIBS) \
+        $(CBC_LIBS)
 
 if HAVE_GLPK
@@ -44 +46 @@
 if HAVE_CLP
 lemon_libemon_la_SOURCES += lemon/clp.cc
+endif
+
+if HAVE_CBC
+lemon_libemon_la_SOURCES += lemon/cbc.cc
 endif
 

lemon/config.h.in

@@ -19 +19 @@
 /* Define to 1 if you have CLP */
 #undef HAVE_CLP
+
+/* Define to 1 if you have CBC */
+#undef HAVE_CBC

test/mip_test.cc

@@ -19 +19 @@
 #include "test_tools.h"
 
-
 #ifdef HAVE_CONFIG_H
 #include <lemon/config.h>
@@ -30 +29 @@
 #ifdef HAVE_GLPK
 #include <lemon/glpk.h>
+#endif
+
+#ifdef HAVE_CBC
+#include <lemon/cbc.h>
 #endif
 
@@ -58 +61 @@
 void aTest(MipSolver& mip)
 {
- //The following example is very simple
+  //The following example is very simple
 
 
   typedef MipSolver::Row Row;
   typedef MipSolver::Col Col;
-
 
 
@@ -75 +77 @@
   mip.max();
 
-
   //Unconstrained optimization
   mip.solve();
@@ -81 +82 @@
 
   //Constraints
-  mip.addRow(2*x1+x2 <=2);
-  mip.addRow(x1-2*x2 <=0);
+  mip.addRow(2 * x1 + x2 <= 2);
+  Row y2 = mip.addRow(x1 - 2 * x2 <= 0);
 
   //Nonnegativity of the variable x1
   mip.colLowerBound(x1, 0);
+
 
   //Maximization of x1
@@ -91 +93 @@
   double expected_opt=4.0/5.0;
   solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
+
 
   //Restrict x2 to integer
@@ -103 +106 @@
   solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 
-
+  //Erase a variable
+  mip.erase(x2);
+  mip.rowUpperBound(y2, 8);
+  expected_opt=1;
+  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 
 }
+
 
 template<class MIP>
@@ -145 +153 @@
 #endif
 
+#ifdef HAVE_CBC
+  {
+    CbcMip mip1;
+    aTest(mip1);
+    cloneTest<CbcMip>();
+  }
+#endif
+
   return 0;