From: <par...@us...> - 2010-04-28 21:46:35
|
Revision: 7277 http://octave.svn.sourceforge.net/octave/?rev=7277&view=rev Author: paramaniac Date: 2010-04-28 21:46:29 +0000 (Wed, 28 Apr 2010) Log Message: ----------- control: simplify expressions Modified Paths: -------------- trunk/octave-forge/main/control/inst/@lti/norm.m trunk/octave-forge/main/control/inst/covar.m trunk/octave-forge/main/control/inst/h2syn.m Modified: trunk/octave-forge/main/control/inst/@lti/norm.m =================================================================== --- trunk/octave-forge/main/control/inst/@lti/norm.m 2010-04-28 16:00:12 UTC (rev 7276) +++ trunk/octave-forge/main/control/inst/@lti/norm.m 2010-04-28 21:46:29 UTC (rev 7277) @@ -68,7 +68,7 @@ [a, b, c, d] = ssdata (sys); discrete = ! isct (sys); - if (! discrete && ! all (all (d == 0))) # continuous and non-zero feedthrough + if (! discrete && any (any (d))) # continuous and non-zero feedthrough gain = inf; else [gain, iwarn] = slab13bd (a, b, c, d, discrete); Modified: trunk/octave-forge/main/control/inst/covar.m =================================================================== --- trunk/octave-forge/main/control/inst/covar.m 2010-04-28 16:00:12 UTC (rev 7276) +++ trunk/octave-forge/main/control/inst/covar.m 2010-04-28 21:46:29 UTC (rev 7277) @@ -43,7 +43,7 @@ [a, b, c, d] = ssdata (sys); if (isct (sys)) - if (! all (all (d == 0))) + if (any (any (d))) error ("covar: system is not strictly proper"); endif Modified: trunk/octave-forge/main/control/inst/h2syn.m =================================================================== --- trunk/octave-forge/main/control/inst/h2syn.m 2010-04-28 16:00:12 UTC (rev 7276) +++ trunk/octave-forge/main/control/inst/h2syn.m 2010-04-28 21:46:29 UTC (rev 7277) @@ -103,7 +103,7 @@ d11 = d(1:p1, 1:m1); - if (isct (P) && ! all (all (d11 == 0))) + if (isct (P) && any (any (d11))) warning ("h2syn: setting matrice D11 to zero"); d(1:p1, 1:m1) = 0; endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |