From: <par...@us...> - 2009-12-11 10:48:29
|
Revision: 6632 http://octave.svn.sourceforge.net/octave/?rev=6632&view=rev Author: paramaniac Date: 2009-12-11 10:48:15 +0000 (Fri, 11 Dec 2009) Log Message: ----------- control-oo: display system names of tf and ss objects Modified Paths: -------------- trunk/octave-forge/extra/control-oo/inst/@ss/display.m trunk/octave-forge/extra/control-oo/inst/@tf/display.m Modified: trunk/octave-forge/extra/control-oo/inst/@ss/display.m =================================================================== --- trunk/octave-forge/extra/control-oo/inst/@ss/display.m 2009-12-10 14:15:33 UTC (rev 6631) +++ trunk/octave-forge/extra/control-oo/inst/@ss/display.m 2009-12-11 10:48:15 UTC (rev 6632) @@ -47,16 +47,15 @@ stname = __markemptynames__ (stname); endif - ## fprintf ("SS object %s:\n", inputname(1)); disp (""); if (! isempty (sys.a)) - dispmat (sys.a, "a", stname, stname); - dispmat (sys.b, "b", stname, inname); - dispmat (sys.c, "c", outname, stname); + dispmat (sys.a, [inputname(1), ".a"], stname, stname); + dispmat (sys.b, [inputname(1), ".b"], stname, inname); + dispmat (sys.c, [inputname(1), ".c"], outname, stname); endif - dispmat (sys.d, "d", outname, inname); + dispmat (sys.d, [inputname(1), ".d"], outname, inname); display (sys.lti); # display sampling time Modified: trunk/octave-forge/extra/control-oo/inst/@tf/display.m =================================================================== --- trunk/octave-forge/extra/control-oo/inst/@tf/display.m 2009-12-10 14:15:33 UTC (rev 6631) +++ trunk/octave-forge/extra/control-oo/inst/@tf/display.m 2009-12-11 10:48:15 UTC (rev 6632) @@ -40,11 +40,10 @@ outname = __markemptynames__ (outname); endif - ## fprintf ("TF object %s:\n", inputname(1)); disp (""); for m = 1 : nu - disp (["Transfer function from input \"", inname{m}, "\" to output ..."]); + disp (["Transfer function \"", inputname(1), "\" from input \"", inname{m}, "\" to output ..."]); for p = 1 : ny dispfrac (sys.num{p, m}, sys.den{p, m}, sys.tfvar, outname{p}); endfor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |