# HG changeset patch # User deba # Date 1182866528 0 # Node ID 93b4132ac1e8dc0667a46eed4ff4ec48ee02d973 # Parent 8c791ee69a451b19896bc521379b27cd9668886f The mip column addition hack is necessary only for 4.16 diff -r 8c791ee69a45 -r 93b4132ac1e8 lemon/mip_glpk.cc --- a/lemon/mip_glpk.cc Fri Jun 15 14:36:24 2007 +0000 +++ b/lemon/mip_glpk.cc Tue Jun 26 14:02:08 2007 +0000 @@ -75,7 +75,7 @@ int result = LEMON_lpx(simplex)(lp); // hack: mip does not contain integer variable -#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15) +#if GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION == 16 int tmp = -1; if (LEMON_glp(get_num_int(lp)) == 0) { tmp = LEMON_lpx(add_cols)(lp, 1); @@ -99,7 +99,7 @@ } else { solved = false; } -#if GLP_MAJOR_VERSION > 4 || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION > 15) +#if GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION == 16 if (tmp != -1) { int tmpa[2]; tmpa[1] = tmp;