[Octave-cvsupdate] SF.net SVN: octave:[11018] trunk/octave-forge/main/control/inst/nichols.m

[<par...@us...>]

Revision: 11018
          http://octave.svn.sourceforge.net/octave/?rev=11018&view=rev
Author:   paramaniac
Date:     2012-09-14 18:20:47 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
control: finish nichols

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/nichols.m

Modified: trunk/octave-forge/main/control/inst/nichols.m
===================================================================
--- trunk/octave-forge/main/control/inst/nichols.m	2012-09-14 17:08:00 UTC (rev 11017)
+++ trunk/octave-forge/main/control/inst/nichols.m	2012-09-14 18:20:47 UTC (rev 11018)
@@ -48,37 +48,56 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: November 2009
-## Version: 0.4
+## Version: 0.5
 
-function [mag_r, pha_r, w_r] = nichols (sys, w = [])
+function [mag_r, pha_r, w_r] = nichols (varargin)
 
-  ## TODO: multiplot feature:   nichols (sys1, "b", sys2, "r", ...)
-
-  if (nargin == 0 || nargin > 2)
+  if (nargin == 0)
     print_usage ();
   endif
 
-  [H, w] = __frequency_response__ (sys, w, false, 0, "ext");
+  [H, w] = __frequency_response__ (varargin, false, 0, "ext");
 
-  H = reshape (H, [], 1);
-  mag = abs (H);
-  pha = unwrap (arg (H)) * 180 / pi;
+  H = cellfun (@reshape, H, {[]}, {1}, "uniformoutput", false);
+  mag = cellfun (@abs, H, "uniformoutput", false);
+  pha = cellfun (@(H) unwrap (arg (H)) * 180 / pi, H, "uniformoutput", false);
 
   if (! nargout)
-    mag_db = 20 * log10 (mag);
+    mag_db = cellfun (@(mag) 20 * log10 (mag), mag, "uniformoutput", false);
     
-    plot (pha, mag_db)
+    tmp = cellfun (@isa, varargin, {"lti"});
+    sys_idx = find (tmp);
+    tmp = cellfun (@ischar, varargin);
+    style_idx = find (tmp);
+
+    len = numel (H);  
+    plot_args = {};
+    legend_args = cell (len, 1);
+
+    for k = 1:len
+      if (k == len)
+        lim = nargin;
+      else
+        lim = sys_idx(k+1);
+      endif
+      style = varargin(style_idx(style_idx > sys_idx(k) & style_idx <= lim));
+      plot_args = cat (2, plot_args, pha(k), mag_db(k), style);
+      legend_args{k} = inputname(sys_idx(k));  # watch out for nichols (lticell{:})
+    endfor
+
+    plot (plot_args{:})
     axis ("tight")
     xlim (__axis_margin__ (xlim))
     ylim (__axis_margin__ (ylim))
     grid ("on")
-    title (["Nichols Chart of ", inputname(1)])
+    title ("Nichols Chart")
     xlabel ("Phase [deg]")
     ylabel ("Magnitude [dB]")
+    legend (legend_args)
   else
-    mag_r = mag;
-    pha_r = pha;
-    w_r = w;
+    mag_r = mag{1};
+    pha_r = pha{1};
+    w_r = w{1};
   endif
 
-endfunction
\ No newline at end of file
+endfunction

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.