Changeset 814
- Timestamp:
- Dec 6, 2007 9:04:36 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/Glpk/trunk/glpk.patch
r788 r814 1 diff -Naur glpk /include/glpk.h glpk.patched/include/glpk.h2 --- glpk /include/glpk.h 2007-11-21 10:00:00.000000000 +01003 +++ glpk .patched/include/glpk.h 2007-11-24 15:13:27.000000000 +01001 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 4 @@ -30,7 +30,7 @@ 5 5 … … 11 11 #ifndef _GLP_PROB 12 12 #define _GLP_PROB 13 diff -Naur glpk .OLD/src/glpapi08.c glpk.patched/src/glpapi08.c14 --- glpk /src/glpapi08.c 2007-11-21 10:00:00.000000000 +010015 +++ glpk .patched/src/glpapi08.c 2007-11-24 15:13:03.000000000 +010013 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 16 @@ -345,9 +345,15 @@ 17 17 switch (ret) … … 33 33 else 34 34 { if (parm->msg_lev >= GLP_MSG_ALL) 35 diff -Naur glpk .OLD/src/glpios03.c glpk.patched/src/glpios03.c36 --- glpk /src/glpios03.c 2007-11-21 10:00:00.000000000 +010037 +++ glpk .patched/src/glpios03.c 2007-11-24 15:13:09.000000000 +010035 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 38 @@ -1341,7 +1341,7 @@ 39 39 { if (tree->parm->msg_lev >= GLP_MSG_DBG) … … 45 45 } 46 46 #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.