Mercurial > hg > constant-q-cpp
comparison yeti/cqtkernel.yeti @ 74:c2e9c91ed3f7
vector multiply now takes a list
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Mon, 24 Mar 2014 16:30:40 +0000 |
parents | 642df7b3346f |
children | 872fc9dc0321 |
comparison
equal
deleted
inserted
replaced
73:be277d1367f4 | 74:c2e9c91ed3f7 |
---|---|
87 | 87 |
88 fk = minFreq * (pow 2 ((k-1)/binsPerOctave)); | 88 fk = minFreq * (pow 2 ((k-1)/binsPerOctave)); |
89 | 89 |
90 push binFrequencies fk; | 90 push binFrequencies fk; |
91 | 91 |
92 genKernel f = vec.multiply win | 92 genKernel f = vec.multiply |
93 (vec.fromList | 93 [win, |
94 (map do i: f (2 * pi * fk * i / sampleRate) done [0..nk-1])); | 94 vec.fromList |
95 (map do i: f (2 * pi * fk * i / sampleRate) done [0..nk-1])]; | |
95 | 96 |
96 reals = genKernel cos; | 97 reals = genKernel cos; |
97 imags = genKernel sin; | 98 imags = genKernel sin; |
98 | 99 |
99 atomOffset = firstCentre - ceil(nk/2); | 100 atomOffset = firstCentre - ceil(nk/2); |