Changeset 565:7ab97e2a0c33 in lemon-main

Timestamp:

04/01/09 22:54:00 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Fixing presolver and basis handling (#255)

Location:

lemon

Files:

• glpk.cc (modified) (6 diffs)
• glpk.h (modified) (2 diffs)

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:
+      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;
   }
@@ -601 +619 @@
     }
     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:
+      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;
   }
@@ -820 +853 @@
   }
 
-  void GlpkLp::presolver(bool b) {
-    lpx_set_int_parm(lp, LPX_K_PRESOL, b ? 1 : 0);
+  void GlpkLp::presolver(bool presolve) {
+    _presolve = presolve;
   }
 
@@ -882 +915 @@
     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;
 

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