diff yeti/plotfile.yeti @ 80:872fc9dc0321

Start on inverse code, fix up forward interface a bit
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 29 Apr 2014 08:36:47 +0100
parents 642df7b3346f
children
line wrap: on
line diff
--- a/yeti/plotfile.yeti	Mon Apr 07 16:14:24 2014 +0100
+++ b/yeti/plotfile.yeti	Tue Apr 29 08:36:47 2014 +0100
@@ -23,10 +23,7 @@
         } testStream;
     middle = System#currentTimeMillis();
     eprintln "Generated kernel \(cm.size cq.kernel.kernel) and primed transform (\(cq.octaves) octaves), took \(middle-start)ms, now calculating...";
-    bigM = case (cq.output (Spectrogram ())) of
-        Real s: mat.concatHorizontal s;
-        _: failWith "Real expected";
-    esac;
+    bigM = mat.concatHorizontal cq.cqSpectrogram;
     finish = System#currentTimeMillis();
     eprintln "Done, that part took \(finish-middle)ms, all CQ stuff took \(finish-start)ms";
     eprintln "Plotting...";