Mercurial > hg > constant-q-cpp
changeset 43:f5bd00c97de3
Update to revised api
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Wed, 20 Nov 2013 21:39:42 +0000 |
| parents | 53d1e0d59ac5 |
| children | 337d3b324c75 |
| files | yeti/cqt.yeti yeti/cqtkernel.yeti yeti/test.yeti |
| diffstat | 3 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/yeti/cqt.yeti Wed Nov 20 14:25:54 2013 +0000 +++ b/yeti/cqt.yeti Wed Nov 20 21:39:42 2013 +0000 @@ -46,8 +46,8 @@ (resample.decimated (pow 2 octave) streams[octave])); map do frame: freq = fftFunc (cplx.complexArray frame (vec.zeros kdata.fftSize)); - println "octave = \(octave), frame = \(vec.list frame)"; - println "octave = \(octave), freq = \(freq)"; +// eprintln "octave = \(octave), frame = \(vec.list frame)"; +// eprintln "octave = \(octave), freq = \(freq)"; cm.product kernel (cm.newComplexColumnVector freq); done frames; done [0..octaves-1];
--- a/yeti/cqtkernel.yeti Wed Nov 20 14:25:54 2013 +0000 +++ b/yeti/cqtkernel.yeti Wed Nov 20 21:39:42 2013 +0000 @@ -86,9 +86,7 @@ done [1..binsPerOctave]; - kmat = cm.toSparse - (cm.scaled (1/fftSize) - (cm.newComplexMatrix (RowMajor()) (concat kernels))); + kmat = cm.toSparse (cm.scaled (1/fftSize) (cm.fromRows (concat kernels))); eprintln "density = \(cm.density kmat) (\(cm.nonZeroValues kmat) of \(cm.width kmat * cm.height kmat))";
--- a/yeti/test.yeti Wed Nov 20 14:25:54 2013 +0000 +++ b/yeti/test.yeti Wed Nov 20 21:39:42 2013 +0000 @@ -16,10 +16,10 @@ //testStream = af.open "sweep-48000.wav"; //testStream = af.open "sweep.wav"; -//testStream = manipulate.withDuration 64 (syn.sinusoid 8 2); -// So the stream is [ 0, 1, 0, -1, 0, 1, 0, -1, ... ] +// So the stream is [ 0, 1, 0, -1, 0, 1, 0, -1, ... ] : +testStream = manipulate.withDuration 64 (syn.sinusoid 8 2); -testStream = manipulate.withDuration 32 (syn.pulseTrain 8 0.001); +//testStream = manipulate.withDuration 32 (syn.pulseTrain 8 0.001); eprintln "have test stream";