source: ThirdParty/Glpk/releases/1.3.0/glpk.patch @ 993

Last change on this file since 993 was 897, checked in by stefan, 13 years ago

update to GLPK 4.25
File size: 1.5 KB

  • src/glpapi08.c 

    diff -Naur glpk-4.25/src/glpapi08.c glpk/src/glpapi08.c
    old new  
    348348      switch (ret)
    349349      {  case 0:
    350350            if (tree->mip->mip_stat == GLP_FEAS)
    351             {  if (parm->msg_lev >= GLP_MSG_ALL)
    352                   xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
    353                tree->mip->mip_stat = GLP_OPT;
     351             { if (ios_relative_gap(tree) > 0) {
     352                               if (parm->msg_lev >= GLP_MSG_ALL)
     353                                       xprintf("INTEGER FEASIBLE SOLUTION FOUND, GAP SMALLER THAN TOLERANCE\n");
     354                               tree->mip->mip_stat = GLP_FEAS;
     355               } else {
     356                       if (parm->msg_lev >= GLP_MSG_ALL)
     357                               xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
     358                       tree->mip->mip_stat = GLP_OPT;
     359               }
    354360            }
    355361            else
    356362            {  if (parm->msg_lev >= GLP_MSG_ALL)

  • src/glpios03.c 

    diff -Naur glpk-4.25/src/glpios03.c glpk/src/glpios03.c
    old new  
    13451345         {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
    13461346               xprintf("Relative gap tolerance reached; search terminat"
    13471347                  "ed\n");
    1348             ret = GLP_ETMLIM;
     1348            ret = 0;
    13491349            goto done;
    13501350         }
    13511351#endif
Note: See TracBrowser for help on using the repository browser.