Mercurial > forge

changeset 10612:bb64d7e03a32 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-devel: show singular value plot if no return arguments are specified
author paramaniac
date Wed, 01 Aug 2012 19:44:32 +0000
parents 46edf90675ae
children 751d3a8c941f
files extra/control-devel/inst/__slicot_identification__.m extra/control-devel/inst/moen4.m extra/control-devel/inst/moesp.m extra/control-devel/inst/n4sid.m
diffstat 4 files changed, 82 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/inst/__slicot_identification__.m	Wed Aug 01 18:53:17 2012 +0000
+++ b/extra/control-devel/inst/__slicot_identification__.m	Wed Aug 01 19:44:32 2012 +0000
@@ -24,7 +24,7 @@
 ## Created: May 2012
 ## Version: 0.1
 
-function [sys, x0, info] = __slicot_identification__ (method, dat, varargin)
+function [sys, x0, info] = __slicot_identification__ (method, nout, dat, varargin)
 
   ## determine identification method
   switch (method)
@@ -42,7 +42,7 @@
     error ("%s: first argument must be a time-domain 'iddata' dataset", method);
   endif
   
-  if (nargin > 2)                       # ident (dat, ...)
+  if (nargin > 3)                       # ident (dat, ...)
     if (is_real_scalar (varargin{1}))   # ident (dat, n, ...)
       varargin = horzcat (varargin(2:end), {"order"}, varargin(1));
     endif
@@ -143,54 +143,73 @@
   if (! isempty (conf))
     ctrl = ! conf;
   endif
-  
-  ## perform system identification
-  [a, b, c, d, q, ry, s, k, x0] = slident (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
+
+  if (nout == 0)
+    ## compute singular values
+    [sv, nrec] = slib01ad (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
+
+    ## there is no 'logbar' function
+    svl = log10 (sv);
+    base = floor (min (svl));
 
-  ## compute noise variance matrix factor L
-  ## L L' = Ry,  e = L v
-  ## v becomes white noise with identity covariance matrix
-  l = chol (ry, "lower");
+    clf
+    bar (svl, "basevalue", base)
+    xlim ([0, length(sv)+1])
+    yl = ylim;
+    ylim ([base, yl(2)])
+    title ("Singular Values")
+    ylabel ("Logarithm of Singular Values")
+    xlabel (sprintf ("Estimated System Order with current Tolerance: %d", nrec))
+    grid on
+  else
+    ## perform system identification
+    [a, b, c, d, q, ry, s, k, x0] = slident (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
+
+    ## compute noise variance matrix factor L
+    ## L L' = Ry,  e = L v
+    ## v becomes white noise with identity covariance matrix
+    l = chol (ry, "lower");
 
-  ## assemble model
-  [inname, outname] = get (dat, "inname", "outname");
-  if (strncmpi (noise, "e", 1))         # add error inputs e, not normalized
-    sys = ss (a, [b, k], c, [d, eye(p)], tsam);
-    in_u = __labels__ (inname, "u");
-    in_e = __labels__ (outname, "y");
-    in_e = cellfun (@(x) ["e@", x], in_e, "uniformoutput", false);
-    inname = [in_u; in_e];
-  elseif (strncmpi (noise, "v", 1))     # add error inputs v, normalized
-    sys = ss (a, [b, k*l], c, [d, l], tsam);
-    in_u = __labels__ (inname, "u");
-    in_v = __labels__ (outname, "y");
-    in_v = cellfun (@(x) ["v@", x], in_v, "uniformoutput", false);
-    inname = [in_u; in_v];
-  elseif (strncmpi (noise, "k", 1))     # Kalman predictor
-    sys = ss ([a-k*c], [b-k*d, k], c, [d, zeros(p)], tsam);
-    in_u = __labels__ (inname, "u");
-    in_y = __labels__ (outname, "y");
-    inname = [in_u; in_y];
-  else                                  # no error inputs, default
-    sys = ss (a, b, c, d, tsam);
+    ## assemble model
+    [inname, outname] = get (dat, "inname", "outname");
+    if (strncmpi (noise, "e", 1))         # add error inputs e, not normalized
+      sys = ss (a, [b, k], c, [d, eye(p)], tsam);
+      in_u = __labels__ (inname, "u");
+      in_e = __labels__ (outname, "y");
+      in_e = cellfun (@(x) ["e@", x], in_e, "uniformoutput", false);
+      inname = [in_u; in_e];
+    elseif (strncmpi (noise, "v", 1))     # add error inputs v, normalized
+      sys = ss (a, [b, k*l], c, [d, l], tsam);
+      in_u = __labels__ (inname, "u");
+      in_v = __labels__ (outname, "y");
+      in_v = cellfun (@(x) ["v@", x], in_v, "uniformoutput", false);
+      inname = [in_u; in_v];
+    elseif (strncmpi (noise, "k", 1))     # Kalman predictor
+      sys = ss ([a-k*c], [b-k*d, k], c, [d, zeros(p)], tsam);
+      in_u = __labels__ (inname, "u");
+      in_y = __labels__ (outname, "y");
+      inname = [in_u; in_y];
+    else                                  # no error inputs, default
+      sys = ss (a, b, c, d, tsam);
+    endif
+
+    sys = set (sys, "inname", inname, "outname", outname);
+
+    ## return x0 as vector for single-experiment data
+    ## instead of a cell containing one vector
+    if (numel (x0) == 1)
+      x0 = x0{1};
+    endif
+
+    ## assemble info struct
+    ## Kalman gain matrix K
+    ## state covariance matrix Q
+    ## output covariance matrix Ry
+    ## state-output cross-covariance matrix S
+    ## noise variance matrix factor L
+    info = struct ("K", k, "Q", q, "Ry", ry, "S", s, "L", l);
   endif
 
-  sys = set (sys, "inname", inname, "outname", outname);
-
-  ## return x0 as vector for single-experiment data
-  ## instead of a cell containing one vector
-  if (numel (x0) == 1)
-    x0 = x0{1};
-  endif
-  
-  ## assemble info struct
-  ## Kalman gain matrix K
-  ## state covariance matrix Q
-  ## output covariance matrix Ry
-  ## state-output cross-covariance matrix S
-  ## noise variance matrix factor L
-  info = struct ("K", k, "Q", q, "Ry", ry, "S", s, "L", l);
-
 endfunction
 
 
--- a/extra/control-devel/inst/moen4.m	Wed Aug 01 18:53:17 2012 +0000
+++ b/extra/control-devel/inst/moen4.m	Wed Aug 01 19:44:32 2012 +0000
@@ -232,7 +232,11 @@
     print_usage ();
   endif
 
-  [sys, x0, info] = __slicot_identification__ ("moen4", varargin{:});
+  if (nargout == 0)
+    __slicot_identification__ ("moen4", nargout, varargin{:});
+  else
+    [sys, x0, info] = __slicot_identification__ ("moen4", nargout, varargin{:});
+  endif
 
 endfunction
 
--- a/extra/control-devel/inst/moesp.m	Wed Aug 01 18:53:17 2012 +0000
+++ b/extra/control-devel/inst/moesp.m	Wed Aug 01 19:44:32 2012 +0000
@@ -34,6 +34,10 @@
     print_usage ();
   endif
 
-  [sys, x0, info] = __slicot_identification__ ("moesp", varargin{:});
+  if (nargout == 0)
+    __slicot_identification__ ("moesp", nargout, varargin{:});
+  else
+    [sys, x0, info] = __slicot_identification__ ("moesp", nargout, varargin{:});
+  endif
 
-endfunction
\ No newline at end of file
+endfunction
--- a/extra/control-devel/inst/n4sid.m	Wed Aug 01 18:53:17 2012 +0000
+++ b/extra/control-devel/inst/n4sid.m	Wed Aug 01 19:44:32 2012 +0000
@@ -34,6 +34,10 @@
     print_usage ();
   endif
 
-  [sys, x0, info] = __slicot_identification__ ("n4sid", varargin{:});
+  if (nargout == 0)
+    __slicot_identification__ ("n4sid", nargout, varargin{:});
+  else
+    [sys, x0, info] = __slicot_identification__ ("n4sid", nargout, varargin{:});
+  endif
 
-endfunction
\ No newline at end of file
+endfunction