Ignore:
Timestamp:
Jan 4, 2008 5:24:45 AM (12 years ago)
Author:
stefan
Message:

update to GLPK 4.25

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/glpk.patch

    r814 r897  
    1 diff -Naur glpk-4.24/include/glpk.h glpk/include/glpk.h
    2 --- glpk-4.24/include/glpk.h    2007-11-21 10:00:00.000000000 +0100
    3 +++ glpk/include/glpk.h 2007-11-26 10:14:41.000000000 +0100
    4 @@ -30,7 +30,7 @@
    5  
    6  /* library version numbers: */
    7  #define GLP_MAJOR_VERSION  4
    8 -#define GLP_MINOR_VERSION  23
    9 +#define GLP_MINOR_VERSION  24
    10  
    11  #ifndef _GLP_PROB
    12  #define _GLP_PROB
    13 diff -Naur glpk-4.24/src/glpapi08.c glpk/src/glpapi08.c
    14 --- glpk-4.24/src/glpapi08.c    2007-11-21 10:00:00.000000000 +0100
    15 +++ glpk/src/glpapi08.c 2007-11-26 10:14:41.000000000 +0100
    16 @@ -345,9 +345,15 @@
     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 @@
    175       switch (ret)
    186       {  case 0:
     
    3321             else
    3422             {  if (parm->msg_lev >= GLP_MSG_ALL)
    35 diff -Naur glpk-4.24/src/glpios03.c glpk/src/glpios03.c
    36 --- glpk-4.24/src/glpios03.c    2007-11-21 10:00:00.000000000 +0100
    37 +++ glpk/src/glpios03.c 2007-11-26 10:14:41.000000000 +0100
    38 @@ -1341,7 +1341,7 @@
     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 @@
    3927          {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
    4028                xprintf("Relative gap tolerance reached; search terminat"
     
    4533          }
    4634 #endif
    47 diff -Naur glpk-4.24/src/glpios05.c glpk/src/glpios05.c
    48 --- glpk-4.24/src/glpios05.c    2007-11-21 10:00:00.000000000 +0100
    49 +++ glpk/src/glpios05.c 2007-12-06 15:00:33.000000000 +0100
    50 @@ -1084,7 +1084,16 @@
    51              else
    52              {  /* x'[k] = x[k] - lb[k] * x[kk] */
    53                 jj = mir->cut_vec->pos[kk];
    54 +#if 0
    55                 xassert(jj != 0);
    56 +#else
    57 +               if (jj == 0)
    58 +               {  ios_set_vj(mir->cut_vec, kk, 1.0);
    59 +                  jj = mir->cut_vec->pos[kk];
    60 +                  xassert(jj != 0);
    61 +                  mir->cut_vec->val[jj] = 0.0;
    62 +               }
    63 +#endif
    64                 mir->cut_vec->val[jj] -= mir->cut_vec->val[j] *
    65                    mir->lb[k];
    66              }
Note: See TracChangeset for help on using the changeset viewer.