# HG changeset patch # User jwe # Date 1176496310 0 # Node ID 2a715c6409a56a93e0a9c13fdf4cafec3ea9c6f6 # Parent 25f3fb4a6f1bc3e65bdc6f489a30c76a8dc548de [project @ 2007-04-13 20:31:50 by jwe] diff -r 25f3fb4a6f1b -r 2a715c6409a5 scripts/ChangeLog --- a/scripts/ChangeLog Fri Apr 13 16:18:29 2007 +0000 +++ b/scripts/ChangeLog Fri Apr 13 20:31:50 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-13 John W. Eaton + + * optimization/qp.m: Undo previous change. + 2007-04-13 Geordie McBain * spdiags.m: Fixed the four-argument case to work for columns of diff -r 25f3fb4a6f1b -r 2a715c6409a5 scripts/optimization/qp.m --- a/scripts/optimization/qp.m Fri Apr 13 16:18:29 2007 +0000 +++ b/scripts/optimization/qp.m Fri Apr 13 20:31:50 2007 +0000 @@ -177,13 +177,8 @@ ## will never be active. idx = isinf (bin) & bin < 0; - ## FIXME -- this check should not be necessary, but Octave is - ## incorrectly returning [](0x0) for bin(idx) when bin = [](0x1) and - ## idx = [](0x1). - if (! isempty (idx)) - bin(idx) = []; - Ain(idx,:) = []; - endif + bin(idx) = []; + Ain(idx,:) = []; n_in = length (bin);