Mercurial > hg > pyin
comparison YinUtil.cpp @ 116:e9b99e85b929 tony
one minor one major thing:
* moved line in PYinVamp.cpp -- should not have any effect
* reinstated using peaks instead of using the difference function directly
author | matthiasm |
---|---|
date | Mon, 23 Mar 2015 16:37:28 +0000 |
parents | da92a0abc7c6 |
children | 1629209f5bf2 |
comparison
equal
deleted
inserted
replaced
115:50e39363a3cb | 116:e9b99e85b929 |
---|---|
286 if (yinBuffer[tau] < minVal && tau > 2){ | 286 if (yinBuffer[tau] < minVal && tau > 2){ |
287 minVal = yinBuffer[tau]; | 287 minVal = yinBuffer[tau]; |
288 minInd = tau; | 288 minInd = tau; |
289 } | 289 } |
290 currThreshInd = nThresholdInt-1; | 290 currThreshInd = nThresholdInt-1; |
291 // while (thresholds[currThreshInd] > yinBuffer[tau] && currThreshInd > -1) { | 291 while (thresholds[currThreshInd] > yinBuffer[tau] && currThreshInd > -1) { |
292 // // std::cerr << distribution[currThreshInd] << std::endl; | 292 // std::cerr << distribution[currThreshInd] << std::endl; |
293 // peakProb[tau] += distribution[currThreshInd]; | 293 peakProb[tau] += distribution[currThreshInd]; |
294 // currThreshInd--; | 294 currThreshInd--; |
295 // } | 295 } |
296 peakProb[tau] = 1 - yinBuffer[tau]; | 296 // peakProb[tau] = 1 - yinBuffer[tau]; |
297 sumProb += peakProb[tau]; | 297 sumProb += peakProb[tau]; |
298 tau++; | 298 tau++; |
299 } else { | 299 } else { |
300 tau++; | 300 tau++; |
301 } | 301 } |