Changeset 2213:2c094dfa176d in lemon-0.x

Timestamp:

09/08/06 17:51:32 (18 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Some corrections.

Files:

• lemon/mip_glpk.cc (modified) (2 diffs)
• test/mip_test.cc (modified) (3 diffs)

lemon/mip_glpk.cc

@@ -58 +58 @@
   LpGlpk::SolveExitStatus MipGlpk::_solve(){
     int result = lpx_simplex(lp);
-    result = lpx_integer(lp);
-    switch (result){
-      case LPX_E_OBJLL:
-      case LPX_E_OBJUL:
-      case LPX_E_ITLIM:
-      case LPX_E_TMLIM:
+    //
+    if (lpx_get_status(lp)==LPX_OPT){
+      //Maybe we could try the routine lpx_intopt(lp), a revised
+      //version of lpx_integer
+      result = lpx_integer(lp);
+      switch (result){
       case LPX_E_OK:
-        return SOLVED;
+        return SOLVED;
       default:
-        return UNSOLVED;
+        return UNSOLVED;
+      }
+      
     }
+    return UNSOLVED;
   }
 
@@ -74 +77 @@
   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:
+    if (lpx_get_status(lp)==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);
+      
+      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
+        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
+      }
     }
+    else 
+      return UNDEFINED; //Maybe we could refine this: what does the LP
+                        //relaxation look like
+      
   }  
 

test/mip_test.cc

@@ -13 +13 @@
 
   //  itoa(stat,buf1, 10);
-  check(lp.primalStatus()==stat, buf.str());
+  check(lp.mipStatus()==stat, buf.str());
 
   if (stat ==  LpSolverBase::OPTIMAL) {
@@ -36 +36 @@
 
 
+
+
+
+  //Objective function
+  mip.setObj(x1);
+
+  mip.max();
+
+
+  //Unconstrained optimization
+  mip.solve();
+  //Check it out!
+
   //Constraints
   mip.addRow(2*x1+x2 <=2);  
@@ -45 +58 @@
 
 
-  //Objective function
-  mip.setObj(x1);
-
-  mip.max();
-
-
   //Maximization of x1
-  //over the triangle with vertices
+  //over the triangle with vertices 
   double expected_opt=4.0/5.0;
   solveAndCheck(mip, Mip::OPTIMAL, expected_opt);