[Octave-cvsupdate] SF.net SVN: octave:[8006] trunk/octave-forge/main/control/inst

[<par...@us...>]

Revision: 8006
          http://octave.svn.sourceforge.net/octave/?rev=8006&view=rev
Author:   paramaniac
Date:     2010-12-09 17:15:50 +0000 (Thu, 09 Dec 2010)

Log Message:
-----------
control: avoid multiple calls to inputname since it is an m-file

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@ss/display.m
    trunk/octave-forge/main/control/inst/@tf/display.m

Modified: trunk/octave-forge/main/control/inst/@ss/display.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/display.m	2010-12-09 08:50:57 UTC (rev 8005)
+++ trunk/octave-forge/main/control/inst/@ss/display.m	2010-12-09 17:15:50 UTC (rev 8006)
@@ -24,6 +24,7 @@
 
 function display (sys)
 
+  inputname_str = inputname(1);
   [inname, outname, tsam] = __lti_data__ (sys.lti);
   stname = sys.stname;
 
@@ -34,16 +35,16 @@
   disp ("");
 
   if (! isempty (sys.e))
-    __disp_mat__ (sys.e, [inputname(1), ".e"], stname, stname);
+    __disp_mat__ (sys.e, [inputname_str, ".e"], stname, stname);
   endif
 
   if (! isempty (sys.a))
-    __disp_mat__ (sys.a, [inputname(1), ".a"], stname, stname);
-    __disp_mat__ (sys.b, [inputname(1), ".b"], stname, inname);
-    __disp_mat__ (sys.c, [inputname(1), ".c"], outname, stname);
+    __disp_mat__ (sys.a, [inputname_str, ".a"], stname, stname);
+    __disp_mat__ (sys.b, [inputname_str, ".b"], stname, inname);
+    __disp_mat__ (sys.c, [inputname_str, ".c"], outname, stname);
   endif
 
-  __disp_mat__ (sys.d, [inputname(1), ".d"], outname, inname);
+  __disp_mat__ (sys.d, [inputname_str, ".d"], outname, inname);
 
   display (sys.lti);  # display sampling time
 

Modified: trunk/octave-forge/main/control/inst/@tf/display.m
===================================================================
--- trunk/octave-forge/main/control/inst/@tf/display.m	2010-12-09 08:50:57 UTC (rev 8005)
+++ trunk/octave-forge/main/control/inst/@tf/display.m	2010-12-09 17:15:50 UTC (rev 8006)
@@ -24,6 +24,7 @@
 
 function display (sys)
 
+  inputname_str = inputname(1);
   [inname, outname] = __lti_data__ (sys.lti);
 
   [inname, m] = __labels__ (inname, "u");
@@ -32,7 +33,7 @@
   disp ("");
 
   for nu = 1 : m
-    disp (["Transfer function \"", inputname(1), "\" from input \"", inname{nu}, "\" to output ..."]);
+    disp (["Transfer function \"", inputname_str, "\" from input \"", inname{nu}, "\" to output ..."]);
     for ny = 1 : p
       __disp_frac__ (sys.num{ny, nu}, sys.den{ny, nu}, sys.tfvar, outname{ny});
     endfor


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.