comparison yeti/cqt.yeti @ 41:ae7d2e558ed1

More debug testing

 cqt { maxFreq, minFreq, binsPerOctave } str =
    (sampleRate = str.sampleRate;
     octaves = ceil (log2 (maxFreq / minFreq));
     actualMinFreq = (maxFreq / (pow 2 octaves)) * (pow 2 (1/binsPerOctave));
 
-    eprintln "sampleRate = \(sampleRate), maxFreq = \(maxFreq), minFreq = \(minFreq), actualMinFreq = \(actualMinFreq), octaves = \(octaves), binsPerOctave = \(binsPerOctave)";
+    kdata = cqtkernel.makeKernel { sampleRate, maxFreq, binsPerOctave };
 
-    kdata = cqtkernel.makeKernel { sampleRate, maxFreq, binsPerOctave };
+    eprintln "sampleRate = \(sampleRate), maxFreq = \(maxFreq), minFreq = \(minFreq), actualMinFreq = \(actualMinFreq), octaves = \(octaves), binsPerOctave = \(binsPerOctave), fftSize = \(kdata.fftSize), hop = \(kdata.fftHop)";
 
     eprintln "atomsPerFrame = \(kdata.atomsPerFrame)";
 
-    padding = (kdata.fftSize / 2) * (pow 2 (octaves-1));
+    padding = (kdata.fftSize * (pow 2 (octaves-1)));
 
 eprintln "padding = \(padding)";
 
     str = manipulate.paddedBy padding str;
 

             frames = framer.monoFrames //!!! mono for now
                 { framesize = kdata.fftSize, hop = kdata.fftHop }
                 (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)";
                 cm.product kernel (cm.newComplexColumnVector freq);
             done frames;
         done [0..octaves-1];
 
     // The cqblocks list is a list<list<matrix>>. Each top-level list

     done cqblocks;
 
     cqblocks = array (map2 do octlist octave:
         d = emptyHops * (pow 2 (octaves-octave)) - emptyHops;
 
-        d = 0; //!!!
+//        d = 0; //!!!
 
         eprintln "dropping \(d)";
         drop d octlist;
     done cqblocks [1..octaves]);