# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1601346387 14400
# Node ID cf2f1a0a4ef8d3c5ee71de158ab28e37e3a02234
# Parent  8661ec2115925bca8330da951c5b6b2d3d3c9cd2# Parent  f864f78440e61001662e0f12682e7494f3f6fd13
maint: merge stable to default.

diff -r 8661ec211592 -r cf2f1a0a4ef8 scripts/optimization/glpk.m
--- a/scripts/optimization/glpk.m	Mon Sep 28 18:44:57 2020 -0400
+++ b/scripts/optimization/glpk.m	Mon Sep 28 22:26:27 2020 -0400
@@ -532,9 +532,8 @@
     if (isempty (lb))
       lb = zeros (nx, 1);
     elseif (! isreal (lb) || all (size (lb) > 1) || length (lb) != nx
-            || any (! isfinite (lb)))
-      error ("glpk: LB must be a real and finite valued %d by 1 column vector",
-             nx);
+            || any (isnan (lb)))
+      error ("glpk: LB must be a real valued %d by 1 column vector", nx);
     endif
   else
     lb = zeros (nx, 1);
@@ -546,9 +545,8 @@
     if (isempty (ub))
       ub = Inf (nx, 1);
     elseif (! isreal (ub) || all (size (ub) > 1) || length (ub) != nx
-            || any (! isfinite (ub)))
-      error ("glpk: UB must be a real and finite valued %d by 1 column vector",
-             nx);
+            || any (isnan (ub)))
+      error ("glpk: UB must be a real valued %d by 1 column vector", nx);
     endif
   else
     ub = Inf (nx, 1);
@@ -672,6 +670,6 @@
 %!error<C .* finite values> glpk(NaN, 2, 3)
 %!error<A must be finite> glpk(1, NaN, 3)
 %!error<B must be finite> glpk(1, 2, NaN)
-%!error<LB must be .* finite value> glpk(1, 2, 3, NaN)
-%!error<UB must be .* finite value> glpk(1, 2, 3, 4, NaN)
+%!error<LB must be a real valued> glpk(1, 2, 3, NaN)
+%!error<UB must be a real valued> glpk(1, 2, 3, 4, NaN)
 %!error<SENSE must be .* integer> glpk(1, 2, 3, 4, 5, "F", "C", NaN)