Changeset 2458:93b4132ac1e8 in lemon-0.x for lemon/mip_glpk.cc

Timestamp:

06/26/07 16:02:08 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3295

Message:

The mip column addition hack is necessary only for 4.16

File:

• lemon/mip_glpk.cc (modified) (2 diffs)

lemon/mip_glpk.cc

@@ -76 +76 @@
 
     // 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) {
@@ -100 +100 @@
       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];