[Pkg-octave-commit] rev 702 - in trunk/packages/octave/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-15 21:47:56 +0000 (Tue, 15 Aug 2006)
New Revision: 702

Added:
   trunk/packages/octave/debian/patches/50_fixed-freqz.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.1-00list
Log:
Debian release octave2.1_1:2.1.73-10

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-08-15 20:29:43 UTC (rev 701)
+++ trunk/packages/octave/debian/changelog	2006-08-15 21:47:56 UTC (rev 702)
@@ -1,3 +1,12 @@
+octave2.1 (1:2.1.73-10) unstable; urgency=low
+
+  * Regenerated octave2.1 packages for integrating the last changes
+    regarding octave-depends
+  * debian/patches/50_fixed-freqz.dpatch: Fix script/general/freqz.m,
+    patch taken from upstream CVS (closes: #383097)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 15 Aug 2006 19:05:49 +0200
+
 octave2.9 (2.9.7-2) unstable; urgency=low
 
   * debian/in/octave-depends:

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2006-08-15 20:29:43 UTC (rev 701)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2006-08-15 21:47:56 UTC (rev 702)
@@ -3,3 +3,4 @@
 50_g++4.1-fixes.dpatch
 50_automatic-replot-docstring
 50_return-deffn
+50_fixed-freqz

Added: trunk/packages/octave/debian/patches/50_fixed-freqz.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_fixed-freqz.dpatch	2006-08-15 20:29:43 UTC (rev 701)
+++ trunk/packages/octave/debian/patches/50_fixed-freqz.dpatch	2006-08-15 21:47:56 UTC (rev 702)
@@ -0,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fixed-freqz.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fixed freqz.m (patch taken from upstream CVS)
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/scripts/signal/freqz.m
++++ octave2.1-2.1.73/scripts/signal/freqz.m
+@@ -84,7 +84,7 @@
+     region = Fs = [];
+   elseif (nargin == 4)
+     Fs = [];
+-    if (! isstr (region) && ! isempty (region))
++    if (! ischar (region) && ! isempty (region))
+       Fs = region; 
+       region = [];
+     endif
+@@ -114,26 +114,27 @@
+     endif
+   endif
+ 
+-  a = a(:).';
+-  b = b(:).';
++  a = a(:);
++  b = b(:);
+ 
+   if (! isscalar (n)) ## Explicit frequency vector given
+     w = f = n;
+     if (nargin == 4)  ## Sampling rate Fs was specified
+       w = 2*pi*f/Fs;
+     endif
+-    hb = polyval (fliplr(b), exp(-j*w));
+-    ha = polyval (fliplr(a), exp(-j*w));
++    hb = polyval (fliplr(b), exp(j*w));
++    ha = polyval (fliplr(a), exp(j*w));
+   elseif (strcmp (region, "whole"))
+-    f = Fs * (0:n-1) / n;
+-    ## polyval(fliplr(P),exp(-jw)) is O(p n) and fft(x) is O(n log(n)), where p is the 
+-    ## order of the the polynomial P.  For small p it would be faster to use polyval  
+-    ## but in practice the overhead for polyval is much higher and the little bit of
+-    ## time saved isn't worth the extra code.
++    f = Fs * (0:n-1)' / n;
++    ## polyval(fliplr(P),exp(jw)) is O(p n) and fft(x) is O(n log(n)),
++    ## where p is the order of the the polynomial P.  For small p it
++    ## would be faster to use polyval but in practice the overhead for
++    ## polyval is much higher and the little bit of time saved isn't
++    ## worth the extra code.
+     hb = fft (postpad (b, n));
+     ha = fft (postpad (a, n));
+   else
+-    f = Fs/2 * (0:n-1) / n;
++    f = Fs/2 * (0:n-1)' / n;
+     hb = fft (postpad (b, 2*n))(1:n);
+     ha = fft (postpad (a, 2*n))(1:n);
+   endif
+@@ -169,9 +170,9 @@
+ %!test # Sampling frequency properly interpreted
+ %! b = [1 1 1]/3;
+ %! [h,f] = freqz(b,1,16,320);
+-%! assert(f,[0:15]*10,10*eps);
++%! assert(f,[0:15]'*10,10*eps);
+ %! [h2,f2] = freqz(b,1,[0:15]*10,320);
+ %! assert(f2,[0:15]*10,10*eps);
+-%! assert(h,h2,20*eps);
++%! assert(h,h2',20*eps);
+ %! [h3,f3] = freqz(b,1,32,'whole',320);
+-%! assert(f3,[0:31]*10,10*eps);
++%! assert(f3,[0:31]'*10,10*eps);


Property changes on: trunk/packages/octave/debian/patches/50_fixed-freqz.dpatch
___________________________________________________________________
Name: svn:executable
   + *