Changeset 2441:d8d6ab871608 in lemon-0.x for lemon/mip_glpk.cc

Timestamp:

05/07/07 20:19:55 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3278

Message:

Conformity to new GLPK interface
Hacking Mip without integer variables

File:

• lemon/mip_glpk.cc (modified) (6 diffs)

lemon/mip_glpk.cc

@@ -22 +22 @@
 #include <lemon/mip_glpk.h>
 
+#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15)
+#define LEMON_glp(func) (glp_##func)
+#define LEMON_lpx(func) (lpx_##func)
+
+#define LEMON_GLP(def) (GLP_##def)
+#define LEMON_LPX(def) (LPX_##def)
+
+#else
+
+#define LEMON_glp(func) (lpx_##func)
+#define LEMON_lpx(func) (lpx_##func)
+
+#define LEMON_GLP(def) (LPX_##def)
+#define LEMON_LPX(def) (LPX_##def)
+
+#endif
+
 namespace lemon {
   
   MipGlpk::MipGlpk() {
-    lpx_set_class(lp,LPX_MIP);
+#if !(GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15))
+    LEMON_lpx(set_class)(lp,LEMON_GLP(MIP));
+#endif
   }
 
@@ -31 +50 @@
     switch (col_type){
       case INT:
-        lpx_set_col_kind(lp,i,LPX_IV);
+        LEMON_glp(set_col_kind)(lp,i,LEMON_GLP(IV));
         break;
       case REAL:
-        lpx_set_col_kind(lp,i,LPX_CV);
+        LEMON_glp(set_col_kind)(lp,i,LEMON_GLP(CV));
         break;
     default:;
@@ -42 +61 @@
   
   MipGlpk::ColTypes MipGlpk::_colType(int i) const {
-    switch (lpx_get_col_kind(lp,i)){
-    case LPX_IV:
+    switch (LEMON_glp(get_col_kind)(lp,i)){
+    case LEMON_GLP(IV):
       return INT;//Or binary
-    case LPX_CV:
+    case LEMON_GLP(CV):
       return REAL;
     default:
@@ -54 +73 @@
   
   LpGlpk::SolveExitStatus MipGlpk::_solve() {
-    int result = lpx_simplex(lp);
-    //
-    if (lpx_get_status(lp)==LPX_OPT){
+    int result = LEMON_lpx(simplex)(lp);
+
+    // hack: mip does not contain integer variable 
+#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15)
+    int tmp = -1;
+    if (LEMON_glp(get_num_int(lp)) == 0) {
+      tmp = LEMON_lpx(add_cols)(lp, 1);
+      LEMON_glp(set_col_bnds)(lp, tmp, LEMON_GLP(FX), 0.0, 0.0);
+      LEMON_glp(set_col_kind)(lp, tmp, LEMON_GLP(IV));
+    }
+#endif
+
+    if (LEMON_lpx(get_status)(lp)==LEMON_LPX(OPT)) {
       //Maybe we could try the routine lpx_intopt(lp), a revised
       //version of lpx_integer
-      result = lpx_integer(lp);
+
+      result = LEMON_lpx(integer)(lp);
       switch (result){
-      case LPX_E_OK:
-        return SOLVED;
+      case LEMON_LPX(E_OK):
+        solved = true;
       default:
-        return UNSOLVED;
-      }
-      
+        solved = false;
+      }  
+    } else {
+      solved = false;
     }
-    return UNSOLVED;
+#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15)
+    if (tmp != -1) {
+      int tmpa[2];
+      tmpa[1] = tmp;
+      LEMON_lpx(del_cols)(lp, 1, tmpa);
+    }
+#endif
+    return solved ? SOLVED : UNSOLVED;
   }
 
@@ -74 +112 @@
   LpGlpk::SolutionStatus MipGlpk::_getMipStatus() const {
 
-    if (lpx_get_status(lp)==LPX_OPT){
+    if (LEMON_lpx(get_status)(lp)==LEMON_LPX(OPT)){
       //Meg kell nezni: ha az LP is infinite, akkor ez is, ha az is
       //infeasible, akkor ez is, de ez lehet maskepp is infeasible.
-      int stat=  lpx_mip_status(lp);
+      int stat= LEMON_lpx(mip_status)(lp);
       
       switch (stat) {
-      case LPX_I_UNDEF://Undefined (no solve has been run yet)
+      case LEMON_LPX(I_UNDEF)://Undefined (no solve has been run yet)
         return UNDEFINED;
-      case LPX_I_NOFEAS://There is no feasible integral solution
+      case LEMON_LPX(I_NOFEAS)://There is no feasible integral solution
         return INFEASIBLE;
-        //     case LPX_UNBND://Unbounded
+        //     case LEMON_LPX(UNBND)://Unbounded
         //       return INFINITE;
-      case LPX_I_FEAS://Feasible
+      case LEMON_LPX(I_FEAS)://Feasible
         return FEASIBLE;
-      case LPX_I_OPT://Feasible
+      case LEMON_LPX(I_OPT)://Feasible
         return OPTIMAL;
       default:
-      return UNDEFINED; //to avoid gcc warning
+        return UNDEFINED; //to avoid gcc warning
       //FIXME error
       }
@@ -102 +140 @@
 
   MipGlpk::Value MipGlpk::_getPrimal(int i) const {
-    return lpx_mip_col_val(lp,i);
+    return LEMON_glp(mip_col_val)(lp,i);
   }
   
   MipGlpk::Value MipGlpk::_getPrimalValue() const {
-    return lpx_mip_obj_val(lp);
+    return LEMON_glp(mip_obj_val)(lp);
   }
 } //END OF NAMESPACE LEMON