# HG changeset patch # User jwe # Date 1188496581 0 # Node ID 9de60a998cf3775e085ff604af510ebfecfe5cba # Parent 956148c0d3888920358159ab2b67f09881d2b94e [project @ 2007-08-30 17:54:48 by jwe] diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2007-08-30 John W. Eaton + + * optimization/qp.m: Increase maxit to 200. + 2007-08-30 David Bateman * geometry/inpolygon.m: New file. diff --git a/scripts/optimization/qp.m b/scripts/optimization/qp.m --- a/scripts/optimization/qp.m +++ b/scripts/optimization/qp.m @@ -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; diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2007-08-30 John W. Eaton + + * sysdep.cc (Fpause): Doc fix. + +2007-08-30 Gabriele Pannocchia + + * DLD-FUNCTIONS/__qp__.cc (qp): Resize Wact to n_act-neq, not n_act. + 2007-08-29 John W. Eaton * graphics.cc (class root_figure::properties): diff --git a/src/DLD-FUNCTIONS/__qp__.cc b/src/DLD-FUNCTIONS/__qp__.cc --- a/src/DLD-FUNCTIONS/__qp__.cc +++ b/src/DLD-FUNCTIONS/__qp__.cc @@ -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; diff --git a/src/sysdep.cc b/src/sysdep.cc --- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -713,7 +713,7 @@ \n\ @example\n\ @group\n\ -fprintf (stderr, \"wait please...\n\");\n\ +fprintf (stderr, \"wait please...\\n\");\n\ pause (5);\n\ clc;\n\ @end group\n\