Mercurial > forge

changeset 9557:71f71a885bcd octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-devel: more draft code for iddata cat method
author paramaniac
date Sun, 04 Mar 2012 17:35:42 +0000
parents 2522fc8f74d8
children a648e1df94cb
files extra/control-devel/devel/test_iddata.m extra/control-devel/inst/@iddata/cat.m
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/devel/test_iddata.m	Sun Mar 04 15:58:30 2012 +0000
+++ b/extra/control-devel/devel/test_iddata.m	Sun Mar 04 17:35:42 2012 +0000
@@ -29,4 +29,12 @@
 f.expname{2} = "value 2"
 %}
 
-cat (4, f, f, f)
\ No newline at end of file
+%cat (4, f, f, f)
+
+%cat (1, f, f)
+
+u = iddata ({(1:10).', (21:30).'}, {(41:50).', (61:70).'});
+v = iddata ({(11:20).', (31:40).'}, {(51:60).', (71:80).'});
+
+
+w = cat (1, u, v)
\ No newline at end of file
--- a/extra/control-devel/inst/@iddata/cat.m	Sun Mar 04 15:58:30 2012 +0000
+++ b/extra/control-devel/inst/@iddata/cat.m	Sun Mar 04 17:35:42 2012 +0000
@@ -30,15 +30,19 @@
     case 1      # add samples; p, m, e identical
       %[~, p, m, e]
       %nvec = cellfun (@size
-      [~, p, m, e] = cellfun (@size, varargin, "uniformoutput", false)
+      %[~, p, m, e] = cellfun (@size, varargin, "uniformoutput", false)
       
       %y = cellfun (@(dat) vertcat (dat.y) 
       %dat = cellfun (@iddata, varargin)
       #y = cellfun (@vertcat
       
-      ycell = cellfun (@(dat) dat.y, varargin, "uniformoutput", false)
+      #ycell = cellfun (@(dat) dat.y, varargin, "uniformoutput", false)
 
-
+      tmp = cellfun (@iddata, varargin);
+      y = cellfun (@vertcat, tmp.y, "uniformoutput", false);
+      u = cellfun (@vertcat, tmp.u, "uniformoutput", false);
+      
+      dat = iddata (y, u);
 
       %varargin{:}.y
       %varargin(:).y