Mercurial > hg > constant-q-cpp

changeset 83:31a1271596c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another step in icqt
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 29 Apr 2014 17:32:52 +0100
parents 24ff66e793fd
children 753b6be2a38d
files yeti/cqt.yeti yeti/icqt.yeti
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/yeti/cqt.yeti	Tue Apr 29 17:27:04 2014 +0100
+++ b/yeti/cqt.yeti	Tue Apr 29 17:32:52 2014 +0100
@@ -62,7 +62,8 @@
 
     streams = manipulate.duplicated octaves str;
 
-    //!!! can't be right!
+    // forward transform uses the conjugate-transposed kernel, inverse
+    // uses the original
     kernel = cm.transposed (cm.conjugateTransposed kdata.kernel);
 
 //    eprintln "have kernel";
--- a/yeti/icqt.yeti	Tue Apr 29 17:27:04 2014 +0100
+++ b/yeti/icqt.yeti	Tue Apr 29 17:32:52 2014 +0100
@@ -105,6 +105,17 @@
         map pile (list (flattenOctaves (map decomposeOctaves cq.cqComplex)));
 
     for octaveColumnLists do l: println "octave column list length: \(length l)" done;
+
+    kernel = cm.transposed kdata.kernel; // right way around for the multiply
+    
+    spectra = 
+        map do l:
+            map do col:
+                cm.product kernel (cm.newComplexColumnVector col);
+            done l;
+        done octaveColumnLists;
+
+    eprintln "calculated spectra, now to ifft, overlap-add..."
     
 );