Mercurial > forge

changeset 9420:a367b790a015 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control: don't filter frequencies in frd freqresp when using frequency response commands (pass empty brackets)
author paramaniac
date Fri, 10 Feb 2012 07:46:16 +0000
parents 902ea0de20b8
children 8d2b4cc5c0a1
files main/control/inst/__frequency_response__.m
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/main/control/inst/__frequency_response__.m	Thu Feb 09 18:13:44 2012 +0000
+++ b/main/control/inst/__frequency_response__.m	Fri Feb 10 07:46:16 2012 +0000
@@ -21,7 +21,7 @@
 
 ## Author: Lukas Reichlin <lukas.reichlin@gmail.com>
 ## Created: November 2009
-## Version: 0.3
+## Version: 0.4
 
 function [H, w] = __frequency_response__ (sys, w = [], mimoflag = 0, resptype = 0, wbounds = "std", cellflag = false)
 
@@ -35,20 +35,21 @@
   endif
 
   if (isa (sys, "frd"))
-    if (isempty (w))
-      w = get (sys, "w");
-    else
+    if (! isempty (w))
       warning ("frequency_response: second argument w is ignored");
     endif
+    w = get (sys, "w");
+    H = __freqresp__ (sys, [], resptype, cellflag);
   elseif (isempty (w))  # find interesting frequency range w if not specified
     w = __frequency_vector__ (sys, wbounds);
+    H = __freqresp__ (sys, w, resptype, cellflag);
   elseif (iscell (w) && numel (w) == 2 && issample (w{1}) && issample (w{2}))
     w = __frequency_vector__ (sys, wbounds, w{1}, w{2});
+    H = __freqresp__ (sys, w, resptype, cellflag);
   elseif (! is_real_vector (w))
     error ("frequency_response: second argument w must be a vector of frequencies");
+  else
+    H = __freqresp__ (sys, w, resptype, cellflag);
   endif
 
-  ## frequency response
-  H = __freqresp__ (sys, w, resptype, cellflag);
-
-endfunction
\ No newline at end of file
+endfunction