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

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

Revision: 9748
          http://octave.svn.sourceforge.net/octave/?rev=9748&view=rev
Author:   paramaniac
Date:     2012-03-05 17:48:09 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
control-devel: fix bug

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-05 17:32:53 UTC (rev 9747)
+++ trunk/octave-forge/extra/control-devel/devel/test_iddata.m	2012-03-05 17:48:09 UTC (rev 9748)
@@ -37,4 +37,6 @@
 v = iddata ({(11:20).', (31:40).'}, {(51:60).', (71:80).'});
 
 
-w = cat (1, u, v)
\ No newline at end of file
+w = cat (1, u, v)
+
+cat (3, d, e)
\ No newline at end of file

Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m	2012-03-05 17:32:53 UTC (rev 9747)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/cat.m	2012-03-05 17:48:09 UTC (rev 9748)
@@ -48,7 +48,6 @@
     case 3      # merge - catenate experiments
       check_outputs (p);
       check_inputs (m);
-      check_samples (n);
 
       y = vertcat (tmp.y);
       u = vertcat (tmp.u);
@@ -95,8 +94,8 @@
 function check_samples (n)
 
   if (numel (n) > 1 && ! isequal (n{:}))
-    error ("iddata: cat: number of samples don't match [%s]", \
-           num2str (cell2mat (n), "%d "));
+    error ("iddata: cat: number of samples don't match %s", \
+           mat2str (vertcat (n{:}), 10));
   endif
 
 endfunction

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