Changes in / [572:be6646ac5d89:573:37216ca5b9c6] in lemon-main

Files:

• INSTALL (modified) (1 diff)
• 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)
• lemon/glpk.cc (modified) (6 diffs)
• lemon/glpk.h (modified) (2 diffs)
• m4/lx_check_clp.m4 (deleted)
• m4/lx_check_coin.m4 (added)
• test/mip_test.cc (modified) (8 diffs)
• tools/dimacs-solver.cc (modified) (1 diff)
• tools/lgf-gen.cc (modified) (1 diff)

INSTALL

@@ -151 +151 @@
 
    Disable SoPlex support.
+
+--with-coin[=PREFIX]
+
+   Enable support for COIN-OR solvers (CLP and CBC). You should
+   specify the prefix too. (by default, COIN-OR tools install
+   themselves to the source code directory). This command enables the
+   solvers that are actually found.
+
+--with-coin-includedir=DIR
+
+   The directory where the COIN-OR header files are located. This is
+   only useful when the COIN-OR headers and libraries are not under
+   the same prefix (which is unlikely).
+
+--with-coin-libdir=DIR
+
+   The directory where the COIN-OR libraries are located. This is only
+   useful when the COIN-OR headers and libraries are not under the
+   same prefix (which is unlikely).
+
+--without-coin
+
+   Disable COIN-OR support.

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

@@ -60 +60 @@
 LX_CHECK_CPLEX
 LX_CHECK_SOPLEX
-LX_CHECK_CLP
+LX_CHECK_COIN
 
 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
@@ -120 +120 @@
 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

lemon/glpk.cc

@@ -534 +534 @@
     : LpBase(), LpSolver(), GlpkBase() {
     messageLevel(MESSAGE_NO_OUTPUT);
+    presolver(false);
   }
 
@@ -539 +540 @@
     : LpBase(other), LpSolver(other), GlpkBase(other) {
     messageLevel(MESSAGE_NO_OUTPUT);
+    presolver(false);
   }
 
@@ -575 +577 @@
       break;
     }
-
-    if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+    smcp.presolve = _presolve;
+
+    // If the basis is not valid we get an error return value.
+    // In this case we can try to create a new basis.
+    switch (glp_simplex(lp, &smcp)) {
+    case 0:
+      break;
+    case GLP_EBADB:
+    case GLP_ESING:
+    case GLP_ECOND:
+      glp_term_out(false);
+      glp_adv_basis(lp, 0);
+      glp_term_out(true);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
+
     return SOLVED;
   }
@@ -601 +620 @@
     }
     smcp.meth = GLP_DUAL;
-
-    if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+    smcp.presolve = _presolve;
+
+    // If the basis is not valid we get an error return value.
+    // In this case we can try to create a new basis.
+    switch (glp_simplex(lp, &smcp)) {
+    case 0:
+      break;
+    case GLP_EBADB:
+    case GLP_ESING:
+    case GLP_ECOND:
+      glp_term_out(false);
+      glp_adv_basis(lp, 0);
+      glp_term_out(true);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
     return SOLVED;
   }
@@ -820 +855 @@
   }
 
-  void GlpkLp::presolver(bool b) {
-    lpx_set_int_parm(lp, LPX_K_PRESOL, b ? 1 : 0);
+  void GlpkLp::presolver(bool presolve) {
+    _presolve = presolve;
   }
 
@@ -882 +917 @@
     smcp.meth = GLP_DUAL;
 
-    if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+    // If the basis is not valid we get an error return value.
+    // In this case we can try to create a new basis.
+    switch (glp_simplex(lp, &smcp)) {
+    case 0:
+      break;
+    case GLP_EBADB:
+    case GLP_ESING:
+    case GLP_ECOND:
+      glp_term_out(false);
+      glp_adv_basis(lp, 0);
+      glp_term_out(true);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
+
     if (glp_get_status(lp) != GLP_OPT) return SOLVED;
 

lemon/glpk.h

@@ -179 +179 @@
     SolveExitStatus solveDual();
 
+  private:
+
+    bool _presolve;
+
+  public:
+
     ///Turns on or off the presolver
 
@@ -184 +190 @@
     ///
     ///The presolver is off by default.
-    void presolver(bool b);
+    void presolver(bool presolve);
 
     ///Enum for \c messageLevel() parameter

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;
 

tools/dimacs-solver.cc

@@ -116 +116 @@
            DimacsDescriptor &desc)
 {
-  std::stringstream iss(ap["infcap"]);
+  std::stringstream iss(static_cast<std::string>(ap["infcap"]));
   Value infty;
   iss >> infty;

tools/lgf-gen.cc

@@ -33 +33 @@
 #include <algorithm>
 #include <set>
+#include <ctime>
 #include <lemon/list_graph.h>
 #include <lemon/random.h>