Changeset 2267:3575f17a6e7f in lemon-0.x

Timestamp:

10/30/06 12:32:19 (18 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

LEMON_INTEGER -> INT

Files:

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

lemon/lp_base.h

@@ -1175 +1175 @@
       ///Unfortunately, cplex 7.5 somewhere writes something like
       ///#define INTEGER 'I'
-      LEMON_INTEGER = 1
+      INT = 1
       ///\todo No support for other types yet.
     };
@@ -1198 +1198 @@
     void integer(Col c, bool enable) {
       if (enable)
-        colType(c,LEMON_INTEGER);
+        colType(c,INT);
       else
         colType(c,REAL);
@@ -1208 +1208 @@
     ///\return true if the column has integer type and false if not.
     bool integer(Col c){
-      return (colType(c)==LEMON_INTEGER);
+      return (colType(c)==INT);
     }
 

lemon/mip_cplex.cc

@@ -47 +47 @@
     char ctype[1];
     switch (col_type){
-      case LEMON_INTEGER:
+      case INT:
         ctype[0]=CPX_INTEGER;//'I'
         break;
@@ -66 +66 @@
 
     case CPX_INTEGER:
-      return LEMON_INTEGER;
+      return INT;
     case CPX_CONTINUOUS:
       return REAL;

lemon/mip_glpk.cc

@@ -30 +30 @@
   void MipGlpk::_colType(int i, MipGlpk::ColTypes col_type){
     switch (col_type){
-      case LEMON_INTEGER:
+      case INT:
         lpx_set_col_kind(lp,i,LPX_IV);
         break;
@@ -44 +44 @@
     switch (lpx_get_col_kind(lp,i)){
     case LPX_IV:
-      return LEMON_INTEGER;//Or binary
+      return INT;//Or binary
     case LPX_CV:
       return REAL;

test/mip_test.cc

@@ -77 +77 @@
 
   //Restrict x2 to integer
-  mip.colType(x2,MipSolverBase::LEMON_INTEGER);  
+  mip.colType(x2,MipSolverBase::INT);  
   expected_opt=1.0/2.0;
   solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
@@ -83 +83 @@
 
   //Restrict both to integer
-  mip.colType(x1,MipSolverBase::LEMON_INTEGER);  
+  mip.colType(x1,MipSolverBase::INT);  
   expected_opt=0;
   solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);