The mip column addition hack is necessary only for 4.16
authordeba
Tue, 26 Jun 2007 14:02:08 +0000
changeset 245893b4132ac1e8
parent 2457 8c791ee69a45
child 2459 ea943997a8fe
The mip column addition hack is necessary only for 4.16
lemon/mip_glpk.cc
     1.1 --- a/lemon/mip_glpk.cc	Fri Jun 15 14:36:24 2007 +0000
     1.2 +++ b/lemon/mip_glpk.cc	Tue Jun 26 14:02:08 2007 +0000
     1.3 @@ -75,7 +75,7 @@
     1.4      int result = LEMON_lpx(simplex)(lp);
     1.5  
     1.6      // hack: mip does not contain integer variable 
     1.7 -#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15)
     1.8 +#if GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION == 16
     1.9      int tmp = -1;
    1.10      if (LEMON_glp(get_num_int(lp)) == 0) {
    1.11        tmp = LEMON_lpx(add_cols)(lp, 1);
    1.12 @@ -99,7 +99,7 @@
    1.13      } else {
    1.14        solved = false;
    1.15      }
    1.16 -#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15)
    1.17 +#if GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION == 16
    1.18      if (tmp != -1) {
    1.19        int tmpa[2];
    1.20        tmpa[1] = tmp;