From: <par...@us...> - 2010-09-16 15:48:32
|
Revision: 7738 http://octave.svn.sourceforge.net/octave/?rev=7738&view=rev Author: paramaniac Date: 2010-09-16 15:48:20 +0000 (Thu, 16 Sep 2010) Log Message: ----------- control: small stuff Modified Paths: -------------- trunk/octave-forge/main/control/inst/@lti/mtimes.m trunk/octave-forge/main/control/inst/__ss_dim__.m Modified: trunk/octave-forge/main/control/inst/@lti/mtimes.m =================================================================== --- trunk/octave-forge/main/control/inst/@lti/mtimes.m 2010-09-16 01:40:08 UTC (rev 7737) +++ trunk/octave-forge/main/control/inst/@lti/mtimes.m 2010-09-16 15:48:20 UTC (rev 7738) @@ -51,3 +51,20 @@ endfunction +## Alternative code: consistency vs. compatibility +#{ + M11 = zeros (m1, p1); + M12 = zeros (m1, p2); + M21 = eye (m2, p1); + M22 = zeros (m2, p2); + + + M = [M11, M12; + M21, M22]; + + out_idx = p1 + (1 : p2); + in_idx = 1 : m1; + + sys = __sys_group__ (sys1, sys2); +#} +## Don't forget to adapt @tf/__sys_connect__.m draft code \ No newline at end of file Modified: trunk/octave-forge/main/control/inst/__ss_dim__.m =================================================================== --- trunk/octave-forge/main/control/inst/__ss_dim__.m 2010-09-16 01:40:08 UTC (rev 7737) +++ trunk/octave-forge/main/control/inst/__ss_dim__.m 2010-09-16 15:48:20 UTC (rev 7738) @@ -66,7 +66,7 @@ crows, ccols, drows, dcols); endif - if (! isempty (e) && any (size (e) != n)) + if (! isempty (e) && ! size_equal (e, a)) error ("ss: system matrices a(%dx%d) and e(%dx%d) are incompatible", arows, acols, rows (e), columns (e)); endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |