spectrogram now works for r>1

Author: bjarthur

src/periodogram.jl

@@ -54,7 +54,8 @@ function spectrogram(s; n=int(length(s)/8), m=int(n/2), r=1, w=(n)->ones(n,1))
   w=w(n)
   p=[periodogram(s.*w) for s in arraysplit(s, n, m)]
   p=hcat(p...)
-  t=(0:size(p,2)-1)*(n-m)/r + n/2
+  p/=r
+  t=( (0:size(p,2)-1)*(n-m) + n/2) / r
   f=(0:size(p,1)-1)/size(p,1)*r
   p, t, f
 end

test/data/spectrogram_f.txt

@@ -1,129 +1,129 @@
 0
-.00390625
-.0078125
-.01171875
-.015625
-.01953125
-.0234375
-.02734375
-.03125
-.03515625
 .0390625
-.04296875
-.046875
-.05078125
-.0546875
-.05859375
-.0625
-.06640625
-.0703125
-.07421875
 .078125
-.08203125
-.0859375
-.08984375
-.09375
-.09765625
-.1015625
-.10546875
-.109375
-.11328125
 .1171875
-.12109375
-.125
-.12890625
-.1328125
-.13671875
-.140625
-.14453125
-.1484375
-.15234375
 .15625
-.16015625
-.1640625
-.16796875
-.171875
-.17578125
-.1796875
-.18359375
-.1875
-.19140625
 .1953125
-.19921875
-.203125
-.20703125
-.2109375
-.21484375
-.21875
-.22265625
-.2265625
-.23046875
 .234375
-.23828125
-.2421875
-.24609375
-.25
-.25390625
-.2578125
-.26171875
-.265625
-.26953125
 .2734375
-.27734375
-.28125
-.28515625
-.2890625
-.29296875
-.296875
-.30078125
-.3046875
-.30859375
 .3125
-.31640625
-.3203125
-.32421875
-.328125
-.33203125
-.3359375
-.33984375
-.34375
-.34765625
 .3515625
-.35546875
-.359375
-.36328125
-.3671875
-.37109375
-.375
-.37890625
-.3828125
-.38671875
 .390625
-.39453125
-.3984375
-.40234375
-.40625
-.41015625
-.4140625
-.41796875
-.421875
-.42578125
 .4296875
-.43359375
-.4375
-.44140625
-.4453125
-.44921875
-.453125
-.45703125
-.4609375
-.46484375
 .46875
-.47265625
-.4765625
-.48046875
-.484375
-.48828125
-.4921875
-.49609375
-.5
+.5078125
+.546875
+.5859375
+.625
+.6640625
+.703125
+.7421875
+.78125
+.8203125
+.859375
+.8984375
+.9375
+.9765625
+1.015625
+1.0546875
+1.09375
+1.1328125
+1.171875
+1.2109375
+1.25
+1.2890625
+1.328125
+1.3671875
+1.40625
+1.4453125
+1.484375
+1.5234375
+1.5625
+1.6015625
+1.640625
+1.6796875
+1.71875
+1.7578125
+1.796875
+1.8359375
+1.875
+1.9140625
+1.953125
+1.9921875
+2.03125
+2.0703125
+2.109375
+2.1484375
+2.1875
+2.2265625
+2.265625
+2.3046875
+2.34375
+2.3828125
+2.421875
+2.4609375
+2.5
+2.5390625
+2.578125
+2.6171875
+2.65625
+2.6953125
+2.734375
+2.7734375
+2.8125
+2.8515625
+2.890625
+2.9296875
+2.96875
+3.0078125
+3.046875
+3.0859375
+3.125
+3.1640625
+3.203125
+3.2421875
+3.28125
+3.3203125
+3.359375
+3.3984375
+3.4375
+3.4765625
+3.515625
+3.5546875
+3.59375
+3.6328125
+3.671875
+3.7109375
+3.75
+3.7890625
+3.828125
+3.8671875
+3.90625
+3.9453125
+3.984375
+4.0234375
+4.0625
+4.1015625
+4.140625
+4.1796875
+4.21875
+4.2578125
+4.296875
+4.3359375
+4.375
+4.4140625
+4.453125
+4.4921875
+4.53125
+4.5703125
+4.609375
+4.6484375
+4.6875
+4.7265625
+4.765625
+4.8046875
+4.84375
+4.8828125
+4.921875
+4.9609375
+5