From: <par...@us...> - 2010-08-30 14:11:27
|
Revision: 7608 http://octave.svn.sourceforge.net/octave/?rev=7608&view=rev Author: paramaniac Date: 2010-08-30 14:11:21 +0000 (Mon, 30 Aug 2010) Log Message: ----------- contro: avoid unnecessary argument checking Modified Paths: -------------- trunk/octave-forge/main/control/inst/h2syn.m trunk/octave-forge/main/control/inst/hinfsyn.m trunk/octave-forge/main/control/inst/isctrb.m Modified: trunk/octave-forge/main/control/inst/h2syn.m =================================================================== --- trunk/octave-forge/main/control/inst/h2syn.m 2010-08-30 14:07:36 UTC (rev 7607) +++ trunk/octave-forge/main/control/inst/h2syn.m 2010-08-30 14:11:21 UTC (rev 7608) @@ -113,7 +113,7 @@ endif if (! isdetectable (P(p1+1 : p, :))) - error ("h2syn: (A, C2) must be detectable"); + error ("h2syn: (C2, A) must be detectable"); endif ## H-2 synthesis Modified: trunk/octave-forge/main/control/inst/hinfsyn.m =================================================================== --- trunk/octave-forge/main/control/inst/hinfsyn.m 2010-08-30 14:07:36 UTC (rev 7607) +++ trunk/octave-forge/main/control/inst/hinfsyn.m 2010-08-30 14:11:21 UTC (rev 7608) @@ -116,7 +116,7 @@ endif if (! isdetectable (P(p1+1 : p, :))) - error ("hinfsyn: (A, C2) must be detectable"); + error ("hinfsyn: (C2, A) must be detectable"); endif ## H-infinity synthesis Modified: trunk/octave-forge/main/control/inst/isctrb.m =================================================================== --- trunk/octave-forge/main/control/inst/isctrb.m 2010-08-30 14:07:36 UTC (rev 7607) +++ trunk/octave-forge/main/control/inst/isctrb.m 2010-08-30 14:11:21 UTC (rev 7608) @@ -67,6 +67,9 @@ [A, B] = ssdata (A); elseif (nargin < 2) # isctrb (A, B), isctrb (A, B, tol) print_usage (); + elseif (isempty (A) || isempty (B) || rows (A) != rows (B) || ! issquare (A)) + error ("isctrb: A(%dx%d), B(%dx%d)", + rows (A), columns (A), rows (B), columns (B)); endif ## check tol dimensions @@ -75,12 +78,6 @@ rows (tol), columns (tol)); endif - ## check dimensions compatibility - if (isempty (A) || isempty (B) || rows (A) != rows (B) || ! issquare (A)) - error ("isctrb: A(%dx%d), B(%dx%d)", - rows (A), columns (A), rows (B), columns (B)); - endif - [Ac, Bc, U, ncont] = slab01od (A, B, tol); U = U(:, 1:ncont); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |