Mercurial > octave

changeset 33021:46fc602f334c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 14 Feb 2024 15:01:14 +0100
parents dc69e574b97a (current diff) db32db01963a (diff)
children 92a2e883af17
files libinterp/dldfcn/__glpk__.cc
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/__glpk__.cc	Tue Feb 13 16:44:15 2024 -0500
+++ b/libinterp/dldfcn/__glpk__.cc	Wed Feb 14 15:01:14 2024 +0100
@@ -167,7 +167,7 @@
           break;
         }
 
-      glp_set_row_bnds (lp, i+1, typx, b[i], b[i]);
+      glp_set_row_bnds (lp, i+1, typx, typx == GLP_DB ? -b[i] : b[i], b[i]);
 
     }
 
--- a/scripts/optimization/glpk.m	Tue Feb 13 16:44:15 2024 -0500
+++ b/scripts/optimization/glpk.m	Wed Feb 14 15:01:14 2024 +0100
@@ -652,6 +652,22 @@
 %!   assert (A(i,:) * xmin <= b(i));
 %! endfor
 
+%!testif HAVE_GLPK
+%! sense = 1;
+%! c = [-1, -1]';
+%! A = [1, 0; 0, 1];
+%! b = [1, 1]';
+%! ctype = ['D', 'D']';
+%! lb = [-1, -1]';
+%! ub = [];
+%! vartype = ['I', 'I']';
+%! param.msglev = 0;
+%! [xmin, fmin, errnum, extra] = glpk (c, A, b, lb, ub, ctype, vartype, ...
+%!   sense, param);
+%! assert (fmin, c' * xmin);
+%! for i = 1:2
+%!   assert (A(i,:) * xmin <= b(i));
+%! endfor
 
 %!testif HAVE_GLPK
 %! sense = 1;