source: ThirdParty/Glpk/stable/1.4/glpk.patch @ 1249

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

downgrade to use glpk 4.30 again (because fixes in OsiGlpk? trunk to use it with glpk >= 4.31 are not merged into stable/0.99 yet)

File size: 1.9 KB
  • src/glpapi08.c

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

    diff -Naur glpkdummy/src/glpios03.c glpk/src/glpios03.c
    old new  
    13461346         {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
    13471347               xprintf("Relative gap tolerance reached; search terminat"
    13481348                  "ed\n");
    1349             ret = GLP_ETMLIM;
     1349            ret = 0;
    13501350            goto done;
    13511351         }
    13521352#endif
  • glpk/src/glplpx01.c

    diff -Naur glpk/src/glplpx01.c.orig glpk/src/glplpx01.c
    old new  
    333333      ret = glp_simplex(lp, &parm);
    334334      switch (ret)
    335335      {  case 0:           ret = LPX_E_OK;      break;
    336          case GLP_EBADB:
     336         case GLP_EBADB:   ret = LPX_E_BADB;    break;
    337337         case GLP_ESING:
    338338         case GLP_ECOND:
    339339         case GLP_EBOUND:  ret = LPX_E_FAULT;   break;
Note: See TracBrowser for help on using the repository browser.