source:
ThirdParty/Glpk/trunk/glpk.patch
@
788
Last change on this file since 788 was 788, checked in by stefan, 13 years ago | |
---|---|
File size: 1.9 KB |
-
include/glpk.h
diff -Naur glpk/include/glpk.h glpk.patched/include/glpk.h
old new 30 30 31 31 /* library version numbers: */ 32 32 #define GLP_MAJOR_VERSION 4 33 #define GLP_MINOR_VERSION 2 333 #define GLP_MINOR_VERSION 24 34 34 35 35 #ifndef _GLP_PROB 36 36 #define _GLP_PROB -
src/glpapi08.c
diff -Naur glpk.OLD/src/glpapi08.c glpk.patched/src/glpapi08.c
old new 345 345 switch (ret) 346 346 { case 0: 347 347 if (tree->mip->mip_stat == GLP_FEAS) 348 { if (parm->msg_lev >= GLP_MSG_ALL) 349 xprintf("INTEGER OPTIMAL SOLUTION FOUND\n"); 350 tree->mip->mip_stat = GLP_OPT; 348 { if (ios_relative_gap(tree) > 0) { 349 if (parm->msg_lev >= GLP_MSG_ALL) 350 xprintf("INTEGER FEASIBLE SOLUTION FOUND, GAP SMALLER THAN TOLERANCE\n"); 351 tree->mip->mip_stat = GLP_FEAS; 352 } else { 353 if (parm->msg_lev >= GLP_MSG_ALL) 354 xprintf("INTEGER OPTIMAL SOLUTION FOUND\n"); 355 tree->mip->mip_stat = GLP_OPT; 356 } 351 357 } 352 358 else 353 359 { if (parm->msg_lev >= GLP_MSG_ALL) -
src/glpios03.c
diff -Naur glpk.OLD/src/glpios03.c glpk.patched/src/glpios03.c
old new 1341 1341 { if (tree->parm->msg_lev >= GLP_MSG_DBG) 1342 1342 xprintf("Relative gap tolerance reached; search terminat" 1343 1343 "ed\n"); 1344 ret = GLP_ETMLIM;1344 ret = 0; 1345 1345 goto done; 1346 1346 } 1347 1347 #endif
Note: See TracBrowser
for help on using the repository browser.