From: <par...@us...> - 2012-09-14 17:01:30
|
Revision: 11016 http://octave.svn.sourceforge.net/octave/?rev=11016&view=rev Author: paramaniac Date: 2012-09-14 17:01:20 +0000 (Fri, 14 Sep 2012) Log Message: ----------- control: fix bug Modified Paths: -------------- trunk/octave-forge/main/control/inst/__frequency_vector__.m trunk/octave-forge/main/control/inst/nyquist.m Modified: trunk/octave-forge/main/control/inst/__frequency_vector__.m =================================================================== --- trunk/octave-forge/main/control/inst/__frequency_vector__.m 2012-09-14 14:31:20 UTC (rev 11015) +++ trunk/octave-forge/main/control/inst/__frequency_vector__.m 2012-09-14 17:01:20 UTC (rev 11016) @@ -42,7 +42,7 @@ isc = iscell (sys_cell); if (! isc) # __sys2frd__ methods pass LTI models not in cells - sys_cell = {sys_cell} + sys_cell = {sys_cell}; endif idx = cellfun (@(x) isa (x, "lti"), sys_cell); @@ -53,14 +53,12 @@ if (strcmpi (wbounds, "std")) # plots with explicit frequencies - if (nargin == 2) - dec_min = min (cell2mat (dec_min)); - dec_max = max (cell2mat (dec_max)); - elseif (nargin == 4) # w = {wmin, wmax} + if (nargin == 4) # w = {wmin, wmax} dec_min = log10 (wmin); dec_max = log10 (wmax); else - print_usage (); + dec_min = min (cell2mat (dec_min)); + dec_max = max (cell2mat (dec_max)); endif zp = horzcat (zp{:}); Modified: trunk/octave-forge/main/control/inst/nyquist.m =================================================================== --- trunk/octave-forge/main/control/inst/nyquist.m 2012-09-14 14:31:20 UTC (rev 11015) +++ trunk/octave-forge/main/control/inst/nyquist.m 2012-09-14 17:01:20 UTC (rev 11016) @@ -50,7 +50,7 @@ ## Created: November 2009 ## Version: 0.4 -function [re_r, im_r, w_r] = nyquist2 (varargin) +function [re_r, im_r, w_r] = nyquist (varargin) if (nargin == 0) print_usage (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |