# HG changeset patch # User Chris Cannam # Date 1392376792 0 # Node ID df6d89381f497b0d69d86d0cbb17437e70d44b31 # Parent 0cce8a3c7b989091b3907e5ab7984a056c021e05 Comment out some debug diff -r 0cce8a3c7b98 -r df6d89381f49 yeti/cqtkernel.yeti --- a/yeti/cqtkernel.yeti Fri Feb 14 11:19:45 2014 +0000 +++ b/yeti/cqtkernel.yeti Fri Feb 14 11:19:52 2014 +0000 @@ -26,8 +26,8 @@ fftSize = nextPowerOfTwo (firstCentre + ceil (maxNK/2)); - eprintln "sampleRate = \(sampleRate), maxFreq = \(maxFreq), binsPerOctave = \(binsPerOctave), q = \(q), atomHopFactor = \(atomHopFactor), thresh = \(thresh)"; - eprintln "minFreq = \(minFreq), bigQ = \(bigQ), maxNK = \(maxNK), minNK = \(minNK), atomHop = \(atomHop), firstCentre = \(firstCentre), fftSize = \(fftSize)"; +// eprintln "sampleRate = \(sampleRate), maxFreq = \(maxFreq), binsPerOctave = \(binsPerOctave), q = \(q), atomHopFactor = \(atomHopFactor), thresh = \(thresh)"; +// eprintln "minFreq = \(minFreq), bigQ = \(bigQ), maxNK = \(maxNK), minNK = \(minNK), atomHop = \(atomHop), firstCentre = \(firstCentre), fftSize = \(fftSize)"; winNr = floor((fftSize - ceil(maxNK/2) - firstCentre) / atomHop) + 1; @@ -35,7 +35,7 @@ fftHop = (lastCentre + atomHop) - firstCentre; - eprintln "winNr = \(winNr), lastCentre = \(lastCentre), fftHop = \(fftHop)"; +// eprintln "winNr = \(winNr), lastCentre = \(lastCentre), fftHop = \(fftHop)"; fftFunc = fft.forward fftSize; @@ -88,7 +88,7 @@ kmat = cm.toSparse (cm.scaled (1/fftSize) (cm.fromRows (concat kernels))); - eprintln "density = \(cm.density kmat) (\(cm.nonZeroValues kmat) of \(cm.width kmat * cm.height kmat))"; +// eprintln "density = \(cm.density kmat) (\(cm.nonZeroValues kmat) of \(cm.width kmat * cm.height kmat))"; // Normalisation @@ -104,7 +104,7 @@ weight = (fftHop / fftSize) / (vec.mean (vec.abs wK)); weight = sqrt(weight); - eprintln "weight = \(weight)"; +// eprintln "weight = \(weight)"; { kernel = cm.scaled weight kmat,