Changeset 2168:6474b8254f24 in lemon-0.x for lemon

Timestamp:

08/02/06 22:15:59 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

CPLEX 9.x support.

File:

• lemon/lp_cplex.cc (modified) (9 diffs)

lemon/lp_cplex.cc

@@ -270 +270 @@
     status = CPXlpopt(env, lp);
     //status = CPXprimopt(env, lp);
+#if CPX_VERSION >= 900
+    if (status)
+    {
+      return UNSOLVED;
+    }
+    else
+    {
+      switch (CPXgetstat(env, lp))
+      {
+        case CPX_STAT_OPTIMAL:
+        case CPX_STAT_INFEASIBLE:
+        case CPX_STAT_UNBOUNDED:
+          return SOLVED;
+        default:
+          return UNSOLVED;
+      }
+    }
+#else
     if (status == 0){
       //We want to exclude some cases
@@ -286 +304 @@
       return UNSOLVED;
     }
+#endif
   }
 
@@ -381 +400 @@
   //Hulye cplex
   void statusSwitch(CPXENVptr env,int& stat){
+#if CPX_VERSION < 900
     int lpmethod;
     CPXgetintparam (env,CPX_PARAM_LPMETHOD,&lpmethod);
@@ -392 +412 @@
       }
     }
+#endif
   }
 
   LpCplex::SolutionStatus LpCplex::_getPrimalStatus()
   {
-    
     int stat = CPXgetstat(env, lp);
+#if CPX_VERSION >= 900
+    switch (stat)
+    {
+      case CPX_STAT_OPTIMAL:
+        return OPTIMAL;
+      case CPX_STAT_UNBOUNDED:
+        return INFINITE;
+      case CPX_STAT_INFEASIBLE:
+        return INFEASIBLE;
+      default:
+        return UNDEFINED;
+    }
+#else
     statusSwitch(env,stat);
     //CPXgetstat(env, lp);
@@ -430 +463 @@
       //FIXME error
     }
-
+#endif
   }
 
@@ -453 +486 @@
   {
     int stat = CPXgetstat(env, lp);
+#if CPX_VERSION >= 900
+    switch (stat)
+    {
+      case CPX_STAT_OPTIMAL:
+        return OPTIMAL;
+      case CPX_STAT_UNBOUNDED:
+        return INFEASIBLE;
+      default:
+        return UNDEFINED;
+    }
+#else
     statusSwitch(env,stat);
     switch (stat) {
@@ -465 +509 @@
       //FIXME error
     }
+#endif
   }
 
@@ -470 +515 @@
   {
     int stat = CPXgetstat(env, lp);
+#if CPX_VERSION >= 900
+    switch (stat)
+    {
+      case CPX_STAT_OPTIMAL:
+        return PRIMAL_DUAL_FEASIBLE;
+      case CPX_STAT_UNBOUNDED:
+        return PRIMAL_FEASIBLE_DUAL_INFEASIBLE;
+      default:
+        return UNKNOWN;
+    }
+#else
     switch (stat) {
     case CPX_OPTIMAL://Optimal
@@ -484 +540 @@
       //FIXME error
     }
+#endif
   }