From: <par...@us...> - 2012-06-22 13:41:40
|
Revision: 10662 http://octave.svn.sourceforge.net/octave/?rev=10662&view=rev Author: paramaniac Date: 2012-06-22 13:41:29 +0000 (Fri, 22 Jun 2012) Log Message: ----------- control: use dare directly instead of dlqr Modified Paths: -------------- trunk/octave-forge/main/control/inst/dlqe.m Modified: trunk/octave-forge/main/control/inst/dlqe.m =================================================================== --- trunk/octave-forge/main/control/inst/dlqe.m 2012-06-22 13:09:39 UTC (rev 10661) +++ trunk/octave-forge/main/control/inst/dlqe.m 2012-06-22 13:41:29 UTC (rev 10662) @@ -91,17 +91,17 @@ endif if (isempty (g)) - [~, p, e] = dlqr (a.', c.', q, r, s); # dlqe (a, [], c, q, r, s), g=I + [p, e] = dare (a.', c.', q, r, s); # dlqe (a, [], c, q, r, s), g=I elseif (columns (g) != rows (q) || ! issquare (q)) error ("dlqe: matrices g(%dx%d) and q(%dx%d) have incompatible dimensions", \ rows (g), columns (g), rows (q), columns (q)); elseif (isempty (s)) - [~, p, e] = dlqr (a.', c.', g*q*g.', r); + [p, e] = dare (a.', c.', g*q*g.', r); elseif (columns (g) != rows (s)) error ("dlqe: matrices g(%dx%d) and s(%dx%d) have incompatible dimensions", \ rows (g), columns (g), rows (s), columns (s)); else - [~, p, e] = dlqr (a.', c.', g*q*g.', r, g*s); + [p, e] = dare (a.', c.', g*q*g.', r, g*s); endif m = p*c.' / (c*p*c.' + r); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |