[Octave-cvsupdate] SF.net SVN: octave:[9774] trunk/octave-forge/extra/control-devel

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

Revision: 9774
          http://octave.svn.sourceforge.net/octave/?rev=9774&view=rev
Author:   paramaniac
Date:     2012-03-07 19:09:25 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
control-devel: touch up cat (2)

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/devel/test_iddata.m
    trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m

Modified: trunk/octave-forge/extra/control-devel/devel/test_iddata.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/test_iddata.m	2012-03-07 18:46:36 UTC (rev 9773)
+++ trunk/octave-forge/extra/control-devel/devel/test_iddata.m	2012-03-07 19:09:25 UTC (rev 9774)
@@ -41,7 +41,9 @@
 
 cat (3, d, e)
 
+%cat (1, b, 4)
 
+
 un = iddata ({(1:10).', (21:30).'}, {(41:50).', (61:70).'}, [], "expname", strseq ("alpha", 1:2));
 vn = iddata ({(11:20).', (31:40).'}, {(51:60).', (71:80).'}, [], "expname", strseq ("beta", 1:2));
 n = [un; vn]
@@ -49,4 +51,5 @@
 
 cat (1, un, un, vn, vn, vn)
 
-cat (1, b)
+%dat = iddata (ones (100, 3));
+%dat2 = cat (1, dat, zeros (4, 3), dat)

Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m	2012-03-07 18:46:36 UTC (rev 9773)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m	2012-03-07 19:09:25 UTC (rev 9774)
@@ -37,8 +37,13 @@
   endif
 
   ## store all datasets in a single struct 'tmp'
+  ## tmp is not a valid iddata set anymore,
+  ## but it doesn't matter, we want just a struct
   tmp = cellfun (@iddata, varargin);
   [n, p, m, e] = cellfun (@size, varargin, "uniformoutput", false);
+  
+  ## TODO: dat = iddata (ones (100, 3));
+  ##       dat = cat (1, dat, zeros (4, 3), dat)
 
   ## default values for metadata
   ## some of them are overwritten in the switch statement below
@@ -152,6 +157,8 @@
            mat2str (vertcat (n{:}), 10));
   endif
 
+  ## TODO: check sampling times
+
 endfunction
 
 

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