Mercurial > octave-nkf
changeset 6848:9de60a998cf3
[project @ 2007-08-30 17:54:48 by jwe]
| author | jwe |
|---|---|
| date | Thu, 30 Aug 2007 17:56:21 +0000 |
| parents | 956148c0d388 |
| children | c118ea1823f1 |
| files | scripts/ChangeLog scripts/optimization/qp.m src/ChangeLog src/DLD-FUNCTIONS/__qp__.cc src/sysdep.cc |
| diffstat | 5 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Thu Aug 30 07:42:35 2007 +0000 +++ b/scripts/ChangeLog Thu Aug 30 17:56:21 2007 +0000 @@ -1,3 +1,7 @@ +2007-08-30 John W. Eaton <jwe@octave.org> + + * optimization/qp.m: Increase maxit to 200. + 2007-08-30 David Bateman <dbateman@free.fr> * geometry/inpolygon.m: New file.
--- a/scripts/optimization/qp.m Thu Aug 30 07:42:35 2007 +0000 +++ b/scripts/optimization/qp.m Thu Aug 30 17:56:21 2007 +0000 @@ -267,9 +267,10 @@ endif if (info == 0) + ## FIXME -- make maxit a user option. ## The initial (or computed) guess is feasible. ## We call the solver. - maxit = 100; + maxit = 200; [x, lambda, info, iter] = __qp__ (x0, H, q, A, b, Ain, bin, maxit); else iter = 0;
--- a/src/ChangeLog Thu Aug 30 07:42:35 2007 +0000 +++ b/src/ChangeLog Thu Aug 30 17:56:21 2007 +0000 @@ -1,3 +1,11 @@ +2007-08-30 John W. Eaton <jwe@octave.org> + + * sysdep.cc (Fpause): Doc fix. + +2007-08-30 Gabriele Pannocchia <g.pannocchia@ing.unipi.it> + + * DLD-FUNCTIONS/__qp__.cc (qp): Resize Wact to n_act-neq, not n_act. + 2007-08-29 John W. Eaton <jwe@octave.org> * graphics.cc (class root_figure::properties):
--- a/src/DLD-FUNCTIONS/__qp__.cc Thu Aug 30 07:42:35 2007 +0000 +++ b/src/DLD-FUNCTIONS/__qp__.cc Thu Aug 30 17:56:21 2007 +0000 @@ -130,7 +130,7 @@ n_act++; Aact = Aact.stack (Ain.row (i)); bact.resize (n_act, bin(i)); - Wact.resize (n_act, i); + Wact.resize (n_act-n_eq, i); } } } @@ -427,7 +427,7 @@ n_act++; Aact = Aact.stack (Ain.row (is_block)); bact.resize (n_act, bin(is_block)); - Wact.resize (n_act, is_block); + Wact.resize (n_act-n_eq, is_block); // Adding the reduced step x += alpha * p;