COIN-OR::LEMON - Graph Library

Changeset 2267:3575f17a6e7f in lemon-0.x


Ignore:
Timestamp:
10/30/06 12:32:19 (13 years ago)
Author:
athos
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3025
Message:

LEMON_INTEGER -> INT

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/lp_base.h

    r2260 r2267  
    11751175      ///Unfortunately, cplex 7.5 somewhere writes something like
    11761176      ///#define INTEGER 'I'
    1177       LEMON_INTEGER = 1
     1177      INT = 1
    11781178      ///\todo No support for other types yet.
    11791179    };
     
    11981198    void integer(Col c, bool enable) {
    11991199      if (enable)
    1200         colType(c,LEMON_INTEGER);
     1200        colType(c,INT);
    12011201      else
    12021202        colType(c,REAL);
     
    12081208    ///\return true if the column has integer type and false if not.
    12091209    bool integer(Col c){
    1210       return (colType(c)==LEMON_INTEGER);
     1210      return (colType(c)==INT);
    12111211    }
    12121212
  • lemon/mip_cplex.cc

    r2253 r2267  
    4747    char ctype[1];
    4848    switch (col_type){
    49       case LEMON_INTEGER:
     49      case INT:
    5050        ctype[0]=CPX_INTEGER;//'I'
    5151        break;
     
    6666
    6767    case CPX_INTEGER:
    68       return LEMON_INTEGER;
     68      return INT;
    6969    case CPX_CONTINUOUS:
    7070      return REAL;
  • lemon/mip_glpk.cc

    r2253 r2267  
    3030  void MipGlpk::_colType(int i, MipGlpk::ColTypes col_type){
    3131    switch (col_type){
    32       case LEMON_INTEGER:
     32      case INT:
    3333        lpx_set_col_kind(lp,i,LPX_IV);
    3434        break;
     
    4444    switch (lpx_get_col_kind(lp,i)){
    4545    case LPX_IV:
    46       return LEMON_INTEGER;//Or binary
     46      return INT;//Or binary
    4747    case LPX_CV:
    4848      return REAL;
  • test/mip_test.cc

    r2227 r2267  
    7777
    7878  //Restrict x2 to integer
    79   mip.colType(x2,MipSolverBase::LEMON_INTEGER); 
     79  mip.colType(x2,MipSolverBase::INT); 
    8080  expected_opt=1.0/2.0;
    8181  solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
     
    8383
    8484  //Restrict both to integer
    85   mip.colType(x1,MipSolverBase::LEMON_INTEGER); 
     85  mip.colType(x1,MipSolverBase::INT); 
    8686  expected_opt=0;
    8787  solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
Note: See TracChangeset for help on using the changeset viewer.