annotate scripts/optimization/lsqnonneg.m @ 11588:d5bd2766c640

style fixes for warning and error messages in script files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:51:13 -0500
parents c792872f8942
children b9a89ca0fb75
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
1 ## Copyright (C) 2008-2011 Bill Denney
8406
0b7566aea627 fix & optimize lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8304
diff changeset
2 ## Copyright (C) 2008 Jaroslav Hajek
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
3 ## Copyright (C) 2009 VZLU Prague
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
4 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
5 ## This file is part of Octave.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
6 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
7 ## Octave is free software; you can redistribute it and/or modify it
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
8 ## under the terms of the GNU General Public License as published by
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
9 ## the Free Software Foundation; either version 3 of the License, or (at
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
10 ## your option) any later version.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
11 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
12 ## Octave is distributed in the hope that it will be useful, but
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
13 ## WITHOUT ANY WARRANTY; without even the implied warranty of
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
14 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
15 ## General Public License for more details.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
16 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
17 ## You should have received a copy of the GNU General Public License
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
18 ## along with Octave; see the file COPYING. If not, see
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
19 ## <http://www.gnu.org/licenses/>.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
20
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
21 ## -*- texinfo -*-
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 9635
diff changeset
22 ## @deftypefn {Function File} {@var{x} =} lsqnonneg (@var{c}, @var{d})
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
23 ## @deftypefnx {Function File} {@var{x} =} lsqnonneg (@var{c}, @var{d}, @var{x0})
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
24 ## @deftypefnx {Function File} {[@var{x}, @var{resnorm}] =} lsqnonneg (@dots{})
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
25 ## @deftypefnx {Function File} {[@var{x}, @var{resnorm}, @var{residual}] =} lsqnonneg (@dots{})
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
26 ## @deftypefnx {Function File} {[@var{x}, @var{resnorm}, @var{residual}, @var{exitflag}] =} lsqnonneg (@dots{})
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
27 ## @deftypefnx {Function File} {[@var{x}, @var{resnorm}, @var{residual}, @var{exitflag}, @var{output}] =} lsqnonneg (@dots{})
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
28 ## @deftypefnx {Function File} {[@var{x}, @var{resnorm}, @var{residual}, @var{exitflag}, @var{output}, @var{lambda}] =} lsqnonneg (@dots{})
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
29 ## Minimize @code{norm (@var{c}*@var{x} - d)} subject to
10846
a4f482e66b65 Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents: 10821
diff changeset
30 ## @code{@var{x} >= 0}. @var{c} and @var{d} must be real. @var{x0} is an
a4f482e66b65 Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents: 10821
diff changeset
31 ## optional initial guess for @var{x}.
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
32 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
33 ## Outputs:
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
34 ## @itemize @bullet
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
35 ## @item resnorm
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
36 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
37 ## The squared 2-norm of the residual: norm(@var{c}*@var{x}-@var{d})^2
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
38 ##
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
39 ## @item residual
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
40 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
41 ## The residual: @var{d}-@var{c}*@var{x}
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
42 ##
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
43 ## @item exitflag
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
44 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
45 ## An indicator of convergence. 0 indicates that the iteration count
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
46 ## was exceeded, and therefore convergence was not reached; >0 indicates
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
47 ## that the algorithm converged. (The algorithm is stable and will
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
48 ## converge given enough iterations.)
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
49 ##
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
50 ## @item output
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
51 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
52 ## A structure with two fields:
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
53 ## @itemize @bullet
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
54 ## @item "algorithm": The algorithm used ("nnls")
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
55 ##
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
56 ## @item "iterations": The number of iterations taken.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
57 ## @end itemize
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
58 ##
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
59 ## @item lambda
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
60 ##
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
61 ## Not implemented.
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
62 ## @end itemize
9635
36d885c4a1ac implement pqpnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 9051
diff changeset
63 ## @seealso{optimset, pqpnonneg}
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
64 ## @end deftypefn
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
65
8648
ff61b53eb294 optimization: use PKG_ADD: comments instead of PKG_ADD file
John W. Eaton <jwe@octave.org>
parents: 8600
diff changeset
66 ## PKG_ADD: __all_opts__ ("lsqnonneg");
ff61b53eb294 optimization: use PKG_ADD: comments instead of PKG_ADD file
John W. Eaton <jwe@octave.org>
parents: 8600
diff changeset
67
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
68 ## This is implemented from Lawson and Hanson's 1973 algorithm on page
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
69 ## 161 of Solving Least Squares Problems.
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
70
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
71 function [x, resnorm, residual, exitflag, output, lambda] = lsqnonneg (c, d, x = [], options = struct ())
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
72
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
73 if (nargin == 1 && ischar (c) && strcmp (c, 'defaults'))
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
74 x = optimset ("MaxIter", 1e5);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
75 return
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
76 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
77
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
78 if (! (nargin >= 2 && nargin <= 4 && ismatrix (c) && ismatrix (d) && isstruct (options)))
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
79 print_usage ();
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
80 endif
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
81
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
82 ## Lawson-Hanson Step 1 (LH1): initialize the variables.
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
83 m = rows (c);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
84 n = columns (c);
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
85 if (isempty (x))
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
86 ## Initial guess is 0s.
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
87 x = zeros (n, 1);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
88 else
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
89 ## ensure nonnegative guess.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
90 x = max (x, 0);
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
91 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
92
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
93 useqr = m >= n;
8507
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8407
diff changeset
94 max_iter = optimget (options, "MaxIter", 1e5);
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
95
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
96 ## Initialize P, according to zero pattern of x.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
97 p = find (x > 0).';
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
98 if (useqr)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
99 ## Initialize the QR factorization, economized form.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
100 [q, r] = qr (c(:,p), 0);
8406
0b7566aea627 fix & optimize lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8304
diff changeset
101 endif
0b7566aea627 fix & optimize lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8304
diff changeset
102
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
103 iter = 0;
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
104
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
105 ## LH3: test for completion.
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
106 while (iter < max_iter)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
107 while (iter < max_iter)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
108 iter++;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
109
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
110 ## LH6: compute the positive matrix and find the min norm solution
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
111 ## of the positive problem.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
112 if (useqr)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
113 xtmp = r \ q'*d;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
114 else
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
115 xtmp = c(:,p) \ d;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
116 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
117 idx = find (xtmp < 0);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
118
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
119 if (isempty (idx))
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
120 ## LH7: tmp solution found, iterate.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
121 x(:) = 0;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
122 x(p) = xtmp;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
123 break;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
124 else
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
125 ## LH8, LH9: find the scaling factor.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
126 pidx = p(idx);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
127 sf = x(pidx)./(x(pidx) - xtmp(idx));
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
128 alpha = min (sf);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
129 ## LH10: adjust X.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
130 xx = zeros (n, 1);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
131 xx(p) = xtmp;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
132 x += alpha*(xx - x);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
133 ## LH11: move from P to Z all X == 0.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
134 ## This corresponds to those indices where minimum of sf is attained.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
135 idx = idx (sf == alpha);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
136 p(idx) = [];
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
137 if (useqr)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
138 ## update the QR factorization.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
139 [q, r] = qrdelete (q, r, idx);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
140 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
141 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
142 endwhile
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
143
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
144 ## compute the gradient.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
145 w = c'*(d - c*x);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
146 w(p) = [];
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
147 if (! any (w > 0))
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
148 if (useqr)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
149 ## verify the solution achieved using qr updating.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
150 ## in the best case, this should only take a single step.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
151 useqr = false;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
152 continue;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
153 else
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
154 ## we're finished.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
155 break;
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
156 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
157 endif
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
158
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
159 ## find the maximum gradient.
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
160 idx = find (w == max (w));
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
161 if (numel (idx) > 1)
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
162 warning ("lsqnonneg:nonunique",
11588
d5bd2766c640 style fixes for warning and error messages in script files
John W. Eaton <jwe@octave.org>
parents: 11587
diff changeset
163 "a non-unique solution may be returned due to equal gradients");
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
164 idx = idx(1);
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
165 endif
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
166 ## move the index from Z to P. Keep P sorted.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
167 z = [1:n]; z(p) = [];
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
168 zidx = z(idx);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
169 jdx = 1 + lookup (p, zidx);
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
170 p = [p(1:jdx-1), zidx, p(jdx:end)];
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
171 if (useqr)
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
172 ## insert the column into the QR factorization.
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
173 [q, r] = qrinsert (q, r, jdx, c(:,zidx));
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
174 endif
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
175
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
176 endwhile
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
177 ## LH12: complete.
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
178
7697
0bdfff62cc49 lsqnonneg: use optimset, correctly index Z and P in main loop
bill@denney.ws
parents: 7682
diff changeset
179 ## Generate the additional output arguments.
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
180 if (nargout > 1)
8406
0b7566aea627 fix & optimize lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8304
diff changeset
181 resnorm = norm (c*x - d) ^ 2;
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
182 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
183 if (nargout > 2)
8406
0b7566aea627 fix & optimize lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8304
diff changeset
184 residual = d - c*x;
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
185 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
186 exitflag = iter;
8507
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8407
diff changeset
187 if (nargout > 3 && iter >= max_iter)
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
188 exitflag = 0;
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
189 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
190 if (nargout > 4)
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
191 output = struct ("algorithm", "nnls", "iterations", iter);
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
192 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
193 if (nargout > 5)
8600
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
194 lambda = zeros (size (x));
a6c1aa6f5915 improve lsqnonneg
Jaroslav Hajek <highegg@gmail.com>
parents: 8507
diff changeset
195 lambda(p) = w;
7682
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
196 endif
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
197
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
198 endfunction
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
199
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
200 ## Tests
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
201 %!test
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
202 %! C = [1 0;0 1;2 1];
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
203 %! d = [1;3;-2];
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
204 %! assert (lsqnonneg (C, d), [0;0.5], 100*eps)
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
205
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
206 %!test
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
207 %! C = [0.0372 0.2869;0.6861 0.7071;0.6233 0.6245;0.6344 0.6170];
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
208 %! d = [0.8587;0.1781;0.0747;0.8405];
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
209 %! xnew = [0;0.6929];
f7474c83c782 lsqnonneg: new function
bill@denney.ws
parents:
diff changeset
210 %! assert (lsqnonneg (C, d), xnew, 0.0001)