Changeset 2218:50f1a780a5ff in lemon-0.x for lemon/mip_glpk.cc

Timestamp:

09/21/06 16:46:28 (18 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Interface to the cplex MIP solver: it is little, a bit sour but it is ours.

File:

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

lemon/mip_glpk.cc

@@ -17 +17 @@
  */
 
-#ifndef LEMON_ILP_GLPK_CC
-#define LEMON_ILP_GLPK_CC
+#ifndef LEMON_MIP_GLPK_CC
+#define LEMON_MIP_GLPK_CC
 
 ///\file
-///\brief Implementation of the LEMON-GLPK lp solver interface.
+///\brief Implementation of the LEMON-GLPK mip solver interface.
 
 #include <lemon/mip_glpk.h>
@@ -33 +33 @@
   void MipGlpk::_colType(int i, MipGlpk::ColTypes col_type){
     switch (col_type){
-      case INTEGER:
+      case LEMON_INTEGER:
         lpx_set_col_kind(lp,i,LPX_IV);
         break;
@@ -47 +47 @@
     switch (lpx_get_col_kind(lp,i)){
     case LPX_IV:
-      return INTEGER;//Or binary
+      return LEMON_INTEGER;//Or binary
     case LPX_CV:
       return REAL;
@@ -111 +111 @@
     return lpx_mip_obj_val(lp);
   }
-} //END OG NAMESPACE LEMON
+} //END OF NAMESPACE LEMON
 
-#endif
+#endif //END OF MIP_GLPK_CC