Changeset 814

Timestamp:

Dec 6, 2007 9:04:36 AM (14 years ago)

Author:

stefan

Message:

include fix for mir cut backsubstitution into patch

File:

• ThirdParty/Glpk/trunk/glpk.patch (modified) (4 diffs)

ThirdParty/Glpk/trunk/glpk.patch

@@ -1 @@
-diff -Naur glpk/include/glpk.h glpk.patched/include/glpk.h
---- glpk/include/glpk.h 2007-11-21 10:00:00.000000000 +0100
-+++ glpk.patched/include/glpk.h 2007-11-24 15:13:27.000000000 +0100
+diff -Naur glpk-4.24/include/glpk.h glpk/include/glpk.h
+--- glpk-4.24/include/glpk.h    2007-11-21 10:00:00.000000000 +0100
++++ glpk/include/glpk.h 2007-11-26 10:14:41.000000000 +0100
 @@ -30,7 +30,7 @@
  
@@ -11 +11 @@
  #ifndef _GLP_PROB
  #define _GLP_PROB
-diff -Naur glpk.OLD/src/glpapi08.c glpk.patched/src/glpapi08.c
---- glpk/src/glpapi08.c 2007-11-21 10:00:00.000000000 +0100
-+++ glpk.patched/src/glpapi08.c 2007-11-24 15:13:03.000000000 +0100
+diff -Naur glpk-4.24/src/glpapi08.c glpk/src/glpapi08.c
+--- glpk-4.24/src/glpapi08.c    2007-11-21 10:00:00.000000000 +0100
++++ glpk/src/glpapi08.c 2007-11-26 10:14:41.000000000 +0100
 @@ -345,9 +345,15 @@
        switch (ret)
@@ -33 +33 @@
              else
              {  if (parm->msg_lev >= GLP_MSG_ALL)
-diff -Naur glpk.OLD/src/glpios03.c glpk.patched/src/glpios03.c
---- glpk/src/glpios03.c 2007-11-21 10:00:00.000000000 +0100
-+++ glpk.patched/src/glpios03.c 2007-11-24 15:13:09.000000000 +0100
+diff -Naur glpk-4.24/src/glpios03.c glpk/src/glpios03.c
+--- glpk-4.24/src/glpios03.c    2007-11-21 10:00:00.000000000 +0100
++++ glpk/src/glpios03.c 2007-11-26 10:14:41.000000000 +0100
 @@ -1341,7 +1341,7 @@
           {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
@@ -45 +45 @@
           }
  #endif
+diff -Naur glpk-4.24/src/glpios05.c glpk/src/glpios05.c
+--- glpk-4.24/src/glpios05.c    2007-11-21 10:00:00.000000000 +0100
++++ glpk/src/glpios05.c 2007-12-06 15:00:33.000000000 +0100
+@@ -1084,7 +1084,16 @@
+             else
+             {  /* x'[k] = x[k] - lb[k] * x[kk] */
+                jj = mir->cut_vec->pos[kk];
++#if 0
+                xassert(jj != 0);
++#else
++               if (jj == 0)
++               {  ios_set_vj(mir->cut_vec, kk, 1.0);
++                  jj = mir->cut_vec->pos[kk];
++                  xassert(jj != 0);
++                  mir->cut_vec->val[jj] = 0.0;
++               }
++#endif
+                mir->cut_vec->val[jj] -= mir->cut_vec->val[j] *
+                   mir->lb[k];
+             }