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

Last change on this file since 943 was 897, checked in by stefan, 12 years ago

update to GLPK 4.25

File size: 1.5 KB
RevLine 
[897]1diff -Naur glpk-4.25/src/glpapi08.c glpk/src/glpapi08.c
2--- glpk-4.25/src/glpapi08.c    2007-12-19 10:00:00.000000000 +0100
3+++ glpk/src/glpapi08.c 2008-01-04 11:13:21.000000000 +0100
4@@ -348,9 +348,15 @@
[788]5       switch (ret)
6       {  case 0:
7             if (tree->mip->mip_stat == GLP_FEAS)
8-            {  if (parm->msg_lev >= GLP_MSG_ALL)
9-                  xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
10-               tree->mip->mip_stat = GLP_OPT;
11+             { if (ios_relative_gap(tree) > 0) {
12+                               if (parm->msg_lev >= GLP_MSG_ALL)
13+                                       xprintf("INTEGER FEASIBLE SOLUTION FOUND, GAP SMALLER THAN TOLERANCE\n");
14+                               tree->mip->mip_stat = GLP_FEAS;
15+               } else {
16+                       if (parm->msg_lev >= GLP_MSG_ALL)
17+                               xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
18+                       tree->mip->mip_stat = GLP_OPT;
19+               }
20             }
21             else
22             {  if (parm->msg_lev >= GLP_MSG_ALL)
[897]23diff -Naur glpk-4.25/src/glpios03.c glpk/src/glpios03.c
24--- glpk-4.25/src/glpios03.c    2007-12-19 10:00:00.000000000 +0100
25+++ glpk/src/glpios03.c 2008-01-04 11:13:21.000000000 +0100
26@@ -1345,7 +1345,7 @@
[788]27          {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
28                xprintf("Relative gap tolerance reached; search terminat"
29                   "ed\n");
30-            ret = GLP_ETMLIM;
31+            ret = 0;
32             goto done;
33          }
34 #endif
Note: See TracBrowser for help on using the repository browser.