source: ThirdParty/Glpk/trunk/glpk.patch @ 895

include/glpk.h

@@ -30 +30 @@
 
 /* library version numbers: */
 #define GLP_MAJOR_VERSION  4
-#define GLP_MINOR_VERSION  23
+#define GLP_MINOR_VERSION  24
 
 #ifndef _GLP_PROB
 #define _GLP_PROB

src/glpapi08.c

@@ -345 +345 @@
       switch (ret)
       {  case 0:
             if (tree->mip->mip_stat == GLP_FEAS)
-            {  if (parm->msg_lev >= GLP_MSG_ALL)
-                  xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
-               tree->mip->mip_stat = GLP_OPT;
+             { if (ios_relative_gap(tree) > 0) {
+                               if (parm->msg_lev >= GLP_MSG_ALL)
+                                       xprintf("INTEGER FEASIBLE SOLUTION FOUND, GAP SMALLER THAN TOLERANCE\n");
+                               tree->mip->mip_stat = GLP_FEAS;
+               } else {
+                       if (parm->msg_lev >= GLP_MSG_ALL)
+                               xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
+                       tree->mip->mip_stat = GLP_OPT;
+               }
             }
             else
             {  if (parm->msg_lev >= GLP_MSG_ALL)

src/glpios03.c

@@ -1341 +1341 @@
          {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
                xprintf("Relative gap tolerance reached; search terminat"
                   "ed\n");
-            ret = GLP_ETMLIM;
+            ret = 0;
             goto done;
          }
 #endif

src/glpios05.c

@@ -1084 +1084 @@
             else
             {  /* x'[k] = x[k] - lb[k] * x[kk] */
                jj = mir->cut_vec->pos[kk];
+#if 0
                xassert(jj != 0);
+#else
+               if (jj == 0)
+               {  ios_set_vj(mir->cut_vec, kk, 1.0);
+                  jj = mir->cut_vec->pos[kk];
+                  xassert(jj != 0);
+                  mir->cut_vec->val[jj] = 0.0;
+               }
+#endif
                mir->cut_vec->val[jj] -= mir->cut_vec->val[j] *
                   mir->lb[k];
             }