Mercurial > forge

changeset 9455:48dea1a838d2 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-devel: minor changes
author paramaniac
date Tue, 21 Feb 2012 14:23:31 +0000
parents 86b56d6cd77b
children 5b575a06d7b8
files extra/control-devel/devel/test_iddata.m extra/control-devel/inst/@iddata/display.m extra/control-devel/inst/@iddata/iddata.m
diffstat 3 files changed, 19 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/devel/test_iddata.m	Mon Feb 20 21:33:59 2012 +0000
+++ b/extra/control-devel/devel/test_iddata.m	Tue Feb 21 14:23:31 2012 +0000
@@ -1,3 +1,5 @@
 dat = iddata ((1:10).', (21:30).')
 
-a = iddata ({(1:10).', (21:30).'}, {(31:40).', (41:50).'})
\ No newline at end of file
+a = iddata ({(1:10).', (21:30).'}, {(31:40).', (41:50).'})
+
+b = iddata ({(1:10).', (21:30).'}, [])
\ No newline at end of file
--- a/extra/control-devel/inst/@iddata/display.m	Mon Feb 20 21:33:59 2012 +0000
+++ b/extra/control-devel/inst/@iddata/display.m	Tue Feb 21 14:23:31 2012 +0000
@@ -38,10 +38,14 @@
 
   disp ("");
   disp (str);
+  disp ("");
   
   disp (__col2str__ (exname, "Experiment"));
-  disp (__col2str__ (outname, "Output Channel"));
-  disp (__col2str__ (inname, "Input Channel"));
+  disp ("");
+  disp (__col2str__ (outname, "Outputs"));
+  disp ("");
+  disp (__col2str__ (inname, "Inputs"));
+  disp ("");
   
 %{
   str = strjust (strvcat (exname), "left");
@@ -63,7 +67,7 @@
 
   len = rows (col);
   str = strjust (strvcat (col), "left");
-  str = [repmat("  ", len, 1), str];
+  str = [repmat("   ", len, 1), str];
   str = strvcat (title, str);
 
 endfunction
--- a/extra/control-devel/inst/@iddata/iddata.m	Mon Feb 20 21:33:59 2012 +0000
+++ b/extra/control-devel/inst/@iddata/iddata.m	Tue Feb 21 14:23:31 2012 +0000
@@ -61,7 +61,7 @@
   if (nargin == 1 && isa (y, "iddata"))
     dat = y;
     return;
-  elseif (nargin < 2)
+  elseif (nargin < 1)
     print_usage ();
   endif
 
@@ -109,3 +109,11 @@
   endif
 
 endfunction
+
+
+%!error (iddata);
+%!error (iddata ((1:10).', (1:11).'));
+%!warning (iddata (1:10));
+%!warning (iddata (1:10, 1:10));
+
+