changeset 5:6b59109469c4

Return sparse complex matrix
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 24 Oct 2013 18:53:41 +0100
parents e026003433e5
children 3caae61fa53f
files yeti/cqtkernel.yeti
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/yeti/cqtkernel.yeti	Thu Oct 24 15:09:38 2013 +0100
+++ b/yeti/cqtkernel.yeti	Thu Oct 24 18:53:41 2013 +0100
@@ -7,6 +7,7 @@
 window = load may.signal.window;
 fft = load may.transform.fft;
 pl = load may.plot;
+complexmatrix = load may.matrix.complex;
 
 { pow, round, floor, ceil, nextPowerOfTwo } = load may.mathmisc;
 
@@ -95,6 +96,9 @@
 
 done [1..bins];
 
-array (map array (concat kernels));
+kmat = complexmatrix.newComplexMatrix (ColumnMajor()) (concat kernels); // or row major?
+println "density = \(complexmatrix.density kmat)";
+complexmatrix.toSparse kmat;
 
 
+