Mercurial > hg > octave-lojdl
changeset 6526:2a715c6409a5
[project @ 2007-04-13 20:31:50 by jwe]
author | jwe |
---|---|
date | Fri, 13 Apr 2007 20:31:50 +0000 |
parents | 25f3fb4a6f1b |
children | 2a04f026ef54 |
files | scripts/ChangeLog scripts/optimization/qp.m |
diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2007-04-13 John W. Eaton <jwe@octave.org> + + * optimization/qp.m: Undo previous change. + 2007-04-13 Geordie McBain <geordie.mcbain@aeromech.usyd.edu.au> * spdiags.m: Fixed the four-argument case to work for columns of
--- a/scripts/optimization/qp.m +++ b/scripts/optimization/qp.m @@ -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);