Mercurial > forge
changeset 9588:4a591b303d4b octave-forge
control-devel: touch up cat (2)
| author | paramaniac |
|---|---|
| date | Wed, 07 Mar 2012 19:09:25 +0000 |
| parents | 6e112b8f5f6f |
| children | 3a4a8c3be21d |
| files | extra/control-devel/devel/test_iddata.m extra/control-devel/inst/@iddata/cat.m |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/control-devel/devel/test_iddata.m Wed Mar 07 18:46:36 2012 +0000 +++ b/extra/control-devel/devel/test_iddata.m Wed Mar 07 19:09:25 2012 +0000 @@ -41,6 +41,8 @@ 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)); @@ -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)
--- a/extra/control-devel/inst/@iddata/cat.m Wed Mar 07 18:46:36 2012 +0000 +++ b/extra/control-devel/inst/@iddata/cat.m Wed Mar 07 19:09:25 2012 +0000 @@ -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