[Lemon-commits] Balazs Dezso: Fixing presolver and basis handlin...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/7ab97e2a0c33
changeset: 597:7ab97e2a0c33
user:      Balazs Dezso <deba [at] inf.elte.hu>
date:      Wed Apr 01 22:54:00 2009 +0200
description:
	Fixing presolver and basis handling (#255)

diffstat:

 lemon/glpk.cc |  58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 lemon/glpk.h  |   8 +++++++-
 2 files changed, 60 insertions(+), 6 deletions(-)

diffs (126 lines):

diff --git a/lemon/glpk.cc b/lemon/glpk.cc
--- a/lemon/glpk.cc
+++ b/lemon/glpk.cc
@@ -533,11 +533,13 @@
   GlpkLp::GlpkLp()
     : LpBase(), LpSolver(), GlpkBase() {
     messageLevel(MESSAGE_NO_OUTPUT);
+    presolver(false);
   }
 
   GlpkLp::GlpkLp(const GlpkLp& other)
     : LpBase(other), LpSolver(other), GlpkBase(other) {
     messageLevel(MESSAGE_NO_OUTPUT);
+    presolver(false);
   }
 
   GlpkLp* GlpkLp::newSolver() const { return new GlpkLp; }
@@ -574,8 +576,24 @@
       smcp.msg_lev = GLP_MSG_ALL;
       break;
     }
+    smcp.presolve = _presolve;
 
-    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:
+      lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev);
+      glp_adv_basis(lp, 0);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
+
     return SOLVED;
   }
 
@@ -600,8 +618,23 @@
       break;
     }
     smcp.meth = GLP_DUAL;
+    smcp.presolve = _presolve;
 
-    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:
+      lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev);
+      glp_adv_basis(lp, 0);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
     return SOLVED;
   }
 
@@ -819,8 +852,8 @@
     }
   }
 
-  void GlpkLp::presolver(bool b) {
-    lpx_set_int_parm(lp, LPX_K_PRESOL, b ? 1 : 0);
+  void GlpkLp::presolver(bool presolve) {
+    _presolve = presolve;
   }
 
   void GlpkLp::messageLevel(MessageLevel m) {
@@ -881,7 +914,22 @@
     }
     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:
+      lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev);
+      glp_adv_basis(lp, 0);
+      if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
+      break;
+    default:
+      return UNSOLVED;
+    }
+
     if (glp_get_status(lp) != GLP_OPT) return SOLVED;
 
     glp_iocp iocp;
diff --git a/lemon/glpk.h b/lemon/glpk.h
--- a/lemon/glpk.h
+++ b/lemon/glpk.h
@@ -178,12 +178,18 @@
     ///Solve with dual simplex
     SolveExitStatus solveDual();
 
+  private:
+
+    bool _presolve;
+
+  public:
+
     ///Turns on or off the presolver
 
     ///Turns on (\c b is \c true) or off (\c b is \c false) the presolver
     ///
     ///The presolver is off by default.
-    void presolver(bool b);
+    void presolver(bool presolve);
 
     ///Enum for \c messageLevel() parameter
     enum MessageLevel {