diff yetilab/transform/window.yeti @ 223:51af10e6cd0d

Merge from matrix_opaque_immutable branch
author Chris Cannam
date Sat, 11 May 2013 16:00:58 +0100
parents 77c6a81c577f
children 9b07a28aefad
line wrap: on
line diff
--- a/yetilab/transform/window.yeti	Tue May 07 21:43:10 2013 +0100
+++ b/yetilab/transform/window.yeti	Sat May 11 16:00:58 2013 +0100
@@ -1,11 +1,11 @@
 
 module yetilab.transform.window;
 
-b = load yetilab.block.block;
-bf = load yetilab.block.blockfuncs;
+vec = load yetilab.vector.vector;
+bf = load yetilab.vector.blockfuncs;
 
 cosinewin a0 a1 a2 a3 n =
-    b.fromList
+    vec.fromList
        (map do i:
             a0
             - a1 * cos(2 * pi * i / n)
@@ -18,10 +18,10 @@
 blackman = cosinewin 0.42 0.50 0.08 0.0;
 nuttall = cosinewin 0.3635819 0.4891775 0.1365995 0.0106411;
 blackmanHarris = cosinewin 0.35875 0.48829 0.14128 0.01168;
-boxcar = b.consts 0.5;
+boxcar = vec.consts 0.5;
 
 bartlett n =
-    b.fromList
+    vec.fromList
        (m = n/2;
         concat [
             map do i:
@@ -36,7 +36,7 @@
     case frames of
         []: frames;
          _: (first = head frames;
-             window = windowFunc (b.length first);
+             window = windowFunc (vec.length first);
              map (bf.multiply window) frames);
     esac;