From: <par...@us...> - 2012-04-22 08:37:30
|
Revision: 10309 http://octave.svn.sourceforge.net/octave/?rev=10309&view=rev Author: paramaniac Date: 2012-04-22 08:37:24 +0000 (Sun, 22 Apr 2012) Log Message: ----------- control: style fixes (use strncmpi) Modified Paths: -------------- trunk/octave-forge/main/control/inst/@lti/frdata.m trunk/octave-forge/main/control/inst/@lti/tfdata.m trunk/octave-forge/main/control/inst/@lti/zpkdata.m trunk/octave-forge/main/control/inst/gram.m Modified: trunk/octave-forge/main/control/inst/@lti/frdata.m =================================================================== --- trunk/octave-forge/main/control/inst/@lti/frdata.m 2012-04-22 08:22:39 UTC (rev 10308) +++ trunk/octave-forge/main/control/inst/@lti/frdata.m 2012-04-22 08:37:24 UTC (rev 10309) @@ -1,4 +1,4 @@ -## Copyright (C) 2010, 2011 Lukas F. Reichlin +## Copyright (C) 2010, 2011, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ -48,7 +48,7 @@ ## Author: Lukas Reichlin <luk...@gm...> ## Created: October 2010 -## Version: 0.2 +## Version: 0.3 function [H, w, tsam] = frdata (sys, rtype = "array") @@ -60,7 +60,7 @@ tsam = sys.tsam; - if (lower (rtype(1)) == "v" && issiso (sys)) + if (strncmpi (rtype, "v", 1) && issiso (sys)) H = reshape (H, [], 1); endif Modified: trunk/octave-forge/main/control/inst/@lti/tfdata.m =================================================================== --- trunk/octave-forge/main/control/inst/@lti/tfdata.m 2012-04-22 08:22:39 UTC (rev 10308) +++ trunk/octave-forge/main/control/inst/@lti/tfdata.m 2012-04-22 08:37:24 UTC (rev 10309) @@ -1,4 +1,4 @@ -## Copyright (C) 2009, 2010, 2011 Lukas F. Reichlin +## Copyright (C) 2009, 2010, 2011, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ -54,7 +54,7 @@ ## Author: Lukas Reichlin <luk...@gm...> ## Created: September 2009 -## Version: 0.4 +## Version: 0.5 function [num, den, tsam] = tfdata (sys, rtype = "cell") @@ -66,12 +66,12 @@ tsam = sys.tsam; - if (lower (rtype(1)) != "t") # != tfpoly + if (! strncmpi (rtype, "t", 1)) # != tfpoly num = cellfun (@get, num, "uniformoutput", false); den = cellfun (@get, den, "uniformoutput", false); endif - if (lower (rtype(1)) == "v" && issiso (sys)) # == vector + if (strncmpi (rtype, "v", 1) && issiso (sys)) # == vector num = num{1}; den = den{1}; endif Modified: trunk/octave-forge/main/control/inst/@lti/zpkdata.m =================================================================== --- trunk/octave-forge/main/control/inst/@lti/zpkdata.m 2012-04-22 08:22:39 UTC (rev 10308) +++ trunk/octave-forge/main/control/inst/@lti/zpkdata.m 2012-04-22 08:37:24 UTC (rev 10309) @@ -58,7 +58,7 @@ p = cellfun (@roots, den, "uniformoutput", false); k = cellfun (@(n,d) n(1)/d(1), num, den); - if (lower (rtype(1)) == "v" && issiso (sys)) + if (strncmpi (rtype, "v", 1) && issiso (sys)) z = z{1}; p = p{1}; endif Modified: trunk/octave-forge/main/control/inst/gram.m =================================================================== --- trunk/octave-forge/main/control/inst/gram.m 2012-04-22 08:22:39 UTC (rev 10308) +++ trunk/octave-forge/main/control/inst/gram.m 2012-04-22 08:37:24 UTC (rev 10309) @@ -33,7 +33,7 @@ ## Adapted-By: Lukas Reichlin <luk...@gm...> ## Date: October 2009 -## Version: 0.1 +## Version: 0.2 function W = gram (argin1, argin2) @@ -43,7 +43,6 @@ if (ischar (argin2)) # the function was called as "gram (sys, mode)" sys = argin1; - argin2 = lower (argin2); if (! isa (sys, "lti")) error ("gram: first argument must be an LTI model"); @@ -51,10 +50,10 @@ [a, b, c] = ssdata (sys); - if (strcmp (argin2, "o")) + if (strncmpi (argin2, "o", 1)) a = a.'; b = c.'; - elseif (! strcmp (argin2, "c")) + elseif (! strncmpi (argin2, "c", 1)) print_usage (); endif else # the function was called as "gram (a, b)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |