1.1 --- a/lemon/mip_glpk.cc	Thu Sep 14 19:58:29 2006 +0000
     1.2 +++ b/lemon/mip_glpk.cc	Thu Sep 21 14:46:28 2006 +0000
     1.3 @@ -16,11 +16,11 @@
     1.4   *
     1.5   */
     1.6  
     1.7 -#ifndef LEMON_ILP_GLPK_CC
     1.8 -#define LEMON_ILP_GLPK_CC
     1.9 +#ifndef LEMON_MIP_GLPK_CC
    1.10 +#define LEMON_MIP_GLPK_CC
    1.11  
    1.12  ///\file
    1.13 -///\brief Implementation of the LEMON-GLPK lp solver interface.
    1.14 +///\brief Implementation of the LEMON-GLPK mip solver interface.
    1.15  
    1.16  #include <lemon/mip_glpk.h>
    1.17  
    1.18 @@ -32,7 +32,7 @@
    1.19  
    1.20    void MipGlpk::_colType(int i, MipGlpk::ColTypes col_type){
    1.21      switch (col_type){
    1.22 -      case INTEGER:
    1.23 +      case LEMON_INTEGER:
    1.24  	lpx_set_col_kind(lp,i,LPX_IV);
    1.25  	break;
    1.26        case REAL:
    1.27 @@ -46,7 +46,7 @@
    1.28    MipGlpk::ColTypes MipGlpk::_colType(int i){
    1.29      switch (lpx_get_col_kind(lp,i)){
    1.30      case LPX_IV:
    1.31 -      return INTEGER;//Or binary
    1.32 +      return LEMON_INTEGER;//Or binary
    1.33      case LPX_CV:
    1.34        return REAL;
    1.35      default:
    1.36 @@ -110,6 +110,6 @@
    1.37    MipGlpk::Value MipGlpk::_getPrimalValue(){
    1.38      return lpx_mip_obj_val(lp);
    1.39    }
    1.40 -} //END OG NAMESPACE LEMON
    1.41 +} //END OF NAMESPACE LEMON
    1.42  
    1.43 -#endif
    1.44 +#endif //END OF MIP_GLPK_CC