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

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

Revision: 7727
          http://octave.svn.sourceforge.net/octave/?rev=7727&view=rev
Author:   paramaniac
Date:     2010-09-15 09:59:03 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
control: simplifications

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@lti/ssdata.m
    trunk/octave-forge/main/control/inst/@lti/tfdata.m
    trunk/octave-forge/main/control/inst/@ss/__sys_data__.m
    trunk/octave-forge/main/control/inst/@tf/__sys_data__.m

Modified: trunk/octave-forge/main/control/inst/@lti/ssdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/ssdata.m	2010-09-15 08:01:56 UTC (rev 7726)
+++ trunk/octave-forge/main/control/inst/@lti/ssdata.m	2010-09-15 09:59:03 UTC (rev 7727)
@@ -30,12 +30,8 @@
     sys = ss (sys);
   endif
 
-  sysdata = __sys_data__ (sys); 
+  [a, b, c, d] = __sys_data__ (sys); 
 
-  a = sysdata.a;
-  b = sysdata.b;
-  c = sysdata.c;
-  d = sysdata.d;
   tsam = sys.tsam;
 
 endfunction
\ No newline at end of file

Modified: trunk/octave-forge/main/control/inst/@lti/tfdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/tfdata.m	2010-09-15 08:01:56 UTC (rev 7726)
+++ trunk/octave-forge/main/control/inst/@lti/tfdata.m	2010-09-15 09:59:03 UTC (rev 7727)
@@ -31,10 +31,8 @@
     sys = tf (sys);
   endif
 
-  sysdata = __sys_data__ (sys); 
+  [num, den] = __sys_data__ (sys); 
 
-  num = sysdata.num;
-  den = sysdata.den;
   tsam = sys.tsam;
 
   if (rtype == "vector")

Modified: trunk/octave-forge/main/control/inst/@ss/__sys_data__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__sys_data__.m	2010-09-15 08:01:56 UTC (rev 7726)
+++ trunk/octave-forge/main/control/inst/@ss/__sys_data__.m	2010-09-15 09:59:03 UTC (rev 7727)
@@ -22,12 +22,12 @@
 ## Created: September 2009
 ## Version: 0.1
 
-function data = __sys_data__ (sys)
+function [a, b, c, d, stname] = __sys_data__ (sys)
 
-  data.a = sys.a;
-  data.b = sys.b;
-  data.c = sys.c;
-  data.d = sys.d;
-  data.stname = sys.stname;
+  a = sys.a;
+  b = sys.b;
+  c = sys.c;
+  d = sys.d;
+  stname = sys.stname;
 
 endfunction
\ No newline at end of file

Modified: trunk/octave-forge/main/control/inst/@tf/__sys_data__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@tf/__sys_data__.m	2010-09-15 08:01:56 UTC (rev 7726)
+++ trunk/octave-forge/main/control/inst/@tf/__sys_data__.m	2010-09-15 09:59:03 UTC (rev 7727)
@@ -22,10 +22,10 @@
 ## Created: October 2009
 ## Version: 0.1
 
-function data = __sys_data__ (sys)
+function [num, den, tfvar] = __sys_data__ (sys)
 
-  data.num = sys.num;
-  data.den = sys.den;
-  data.tfvar = sys.tfvar;
+  num = sys.num;
+  den = sys.den;
+  tfvar = sys.tfvar;
 
 endfunction
\ No newline at end of file


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