From: <par...@us...> - 2012-05-31 13:49:49
|
Revision: 10548 http://octave.svn.sourceforge.net/octave/?rev=10548&view=rev Author: paramaniac Date: 2012-05-31 13:49:40 +0000 (Thu, 31 May 2012) Log Message: ----------- control-devel: minor fixes Modified Paths: -------------- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m Modified: trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m 2012-05-31 13:34:10 UTC (rev 10547) +++ trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m 2012-05-31 13:49:40 UTC (rev 10548) @@ -76,7 +76,7 @@ s = []; n = []; conf = []; - noise = "n" + noise = "n"; ## handle keys and values for k = 1 : 2 : nkv @@ -98,9 +98,6 @@ conf = logical (val); case "noise" noise = val; - % none - % e - % v (normalized) otherwise warning ("%s: invalid property name '%s' ignored", method, key); endswitch @@ -143,19 +140,19 @@ ## assemble model [inname, outname] = get (dat, "inname", "outname"); - if (strncmpi (noise, "e", 1)) + 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)) + 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]; - else + else # no error inputs, default sys = ss (a, b, c, d, tsam); endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |