comparison yeti/cqtkernel.yeti @ 40:031386846e3c

Return bin frequencies, for reference; some padding

     
     // Note the MATLAB uses exp(2*pi*1i*x) for a complex generating
     // function. We can't do that here; we need to generate real and imag
     // parts separately as real = cos(2*pi*x), imag = sin(2*pi*x).
     
+    binFrequencies = array [];
+
     kernels = map do k:
     
         nk = round(bigQ * sampleRate / (minFreq * (pow 2 ((k-1)/binsPerOctave))));
 
         // the cq MATLAB toolbox uses a symmetric window for

         win = vec.divideBy nk
            (vec.sqrt
                (window.windowFunction (BlackmanHarris ()) [Symmetric true] nk));
 
         fk = minFreq * (pow 2 ((k-1)/binsPerOctave));
+
+        push binFrequencies fk;
 
         genKernel f = vec.multiply win
            (vec.fromList
                (map do i: f (2 * pi * fk * i / sampleRate) done [0..nk-1]));
     

         fftHop,
         binsPerOctave,
         atomsPerFrame = winNr,
         atomSpacing = atomHop,
         firstCentre,
-        maxFreq,
-        minFreq,
+        maxFrequency = maxFreq,
+        minFrequency = minFreq,
+        binFrequencies,
         bigQ
     });
 
 {
     makeKernel