Changeset 1460:7c58aabb9eea in lemon-0.x for lemon/lp_glpk.cc

Timestamp:

06/09/05 17:03:58 (19 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

I could not check, because: aclocal-1.7: command not found

File:

• lemon/lp_glpk.cc (modified) (2 diffs)

lemon/lp_glpk.cc

@@ -445 +445 @@
       return UNDEFINED;
     case LPX_D_NOFEAS://There is no feasible solution (primal, I guess)
-    case LPX_D_INFEAS://Infeasible 
+//    case LPX_D_INFEAS://Infeasible 
       return INFEASIBLE;
     case LPX_FEAS://Feasible    
@@ -465 +465 @@
   LpGlpk::ProblemTypes LpGlpk::_problemType()
   {
-    int stat=  lpx_get_status(lp);
+      //int stat=  lpx_get_status(lp);
     int statp=  lpx_get_prim_stat(lp);
     int statd=  lpx_get_dual_stat(lp);
-    switch (stat) {
-    case LPX_UNDEF://Undefined (no solve has been run yet)
-      return UNDEFINED;
-      break;
-    case LPX_NOFEAS://There is no feasible solution (primal, I guess)
-    case LPX_INFEAS://Infeasible 
-      return INFEASIBLE;
-      break;
-    case LPX_UNBND://Unbounded
-      return INFINITE;
-      break;
-    case LPX_FEAS://Feasible
-      return FEASIBLE;
-      break;
-    case LPX_OPT://Feasible
-      return OPTIMAL;
-      break;
-    default:
-      return UNDEFINED; //to avoid gcc warning
-      //FIXME error
-    }
+    if (statp==LP_P_FEAS && statd==LP_D_FEAS)
+        return PRIMAL_DUAL_FEASIBLE;
+    if (statp==LP_P_FEAS && statd==LP_D_NOFEAS)
+        return PRIMAL_FEASIBLE_DUAL_INFEASIBLE;
+    if (statp==LP_P_NOFEAS && statd==LP_D_FEAS)
+        return PRIMAL_INFEASIBLE_DUAL_FEASIBLE;
+    if (statp==LP_P_NOFEAS && statd==LP_D_NOFEAS)
+        return PRIMAL_DUAL_INFEASIBLE;
+    //In all other cases
+    return UNKNOWN;
   }