Changeset 2185:e2bf51eab7f7 in lemon-0.x

Timestamp:

08/30/06 18:08:03 (17 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Fixed the mip error (mipstatus was incorrect).

Location:

lemon

Files:

• lp_base.h (modified) (2 diffs)
• mip_glpk.cc (modified) (1 diff)
• mip_glpk.h (modified) (1 diff)

lemon/lp_base.h

@@ -122 +122 @@
       ///\e
     enum SolutionStatus {
-      ///Feasible solution has'n been found (but may exist).
+      ///Feasible solution hasn't been found (but may exist).
 
       ///\todo NOTFOUND might be a better name.
@@ -1206 +1206 @@
     }
 
+    /// The status of the MIP problem
+    SolutionStatus mipStatus() {
+      return _getMipStatus();
+    }
+
   protected:
 
     virtual ColTypes _colType(int col) = 0;
     virtual void _colType(int col, ColTypes col_type) = 0;
+    virtual SolutionStatus _getMipStatus()=0;
 
   };

lemon/mip_glpk.cc

@@ -70 +70 @@
     }
   }
-  
+
+
+  LpGlpk::SolutionStatus MipGlpk::_getMipStatus(){
+
+    //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);
+    switch (stat) {
+    case LPX_I_UNDEF://Undefined (no solve has been run yet)
+      return UNDEFINED;
+   case LPX_I_NOFEAS://There is no feasible integral solution (primal, I guess)
+      return INFEASIBLE;
+//     case LPX_UNBND://Unbounded
+//       return INFINITE;
+    case LPX_I_FEAS://Feasible
+      return FEASIBLE;
+    case LPX_I_OPT://Feasible
+      return OPTIMAL;
+    default:
+      return UNDEFINED; //to avoid gcc warning
+      //FIXME error
+    }
+  }  
+
   MipGlpk::Value MipGlpk::_getPrimal(int i){
     return lpx_mip_col_val(lp,i);

lemon/mip_glpk.h

@@ -50 +50 @@
     
     virtual LpGlpk::SolveExitStatus _solve();
+    virtual LpGlpk::SolutionStatus _getMipStatus();
     virtual ParentLp::Value _getPrimal(int i);
     virtual ParentLp::Value _getPrimalValue();