[Lemon-commits] deba: r3296 - lemon/trunk/lemon

[Lemon SVN]

Author: deba
Date: Tue Jun 26 16:02:08 2007
New Revision: 3296

Modified:
   lemon/trunk/lemon/mip_glpk.cc

Log:
The mip column addition hack is necessary only for 4.16



Modified: lemon/trunk/lemon/mip_glpk.cc
==============================================================================
--- lemon/trunk/lemon/mip_glpk.cc	(original)
+++ lemon/trunk/lemon/mip_glpk.cc	Tue Jun 26 16:02:08 2007
@@ -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;