comparison dsp/tempotracking/DownBeat.cpp @ 501:12b5a9244bb0

Style fixes: avoid unsigned, fix formatting
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 05 Jun 2019 10:21:48 +0100
parents bb78ca3fe7de
children
comparison
equal deleted inserted replaced
500:8a8693f38b91 501:12b5a9244bb0
244 double 244 double
245 DownBeat::measureSpecDiff(d_vec_t oldspec, d_vec_t newspec) 245 DownBeat::measureSpecDiff(d_vec_t oldspec, d_vec_t newspec)
246 { 246 {
247 // JENSEN-SHANNON DIVERGENCE BETWEEN SPECTRAL FRAMES 247 // JENSEN-SHANNON DIVERGENCE BETWEEN SPECTRAL FRAMES
248 248
249 unsigned int SPECSIZE = 512; // ONLY LOOK AT FIRST 512 SAMPLES OF SPECTRUM. 249 int SPECSIZE = 512; // ONLY LOOK AT FIRST 512 SAMPLES OF SPECTRUM.
250 if (SPECSIZE > oldspec.size()/4) { 250 if (SPECSIZE > int(oldspec.size())/4) {
251 SPECSIZE = oldspec.size()/4; 251 SPECSIZE = int(oldspec.size())/4;
252 } 252 }
253 double SD = 0.; 253 double SD = 0.;
254 double sd1 = 0.; 254 double sd1 = 0.;
255 255
256 double sumnew = 0.; 256 double sumnew = 0.;
257 double sumold = 0.; 257 double sumold = 0.;
258 258
259 for (unsigned int i = 0;i < SPECSIZE;i++) { 259 for (int i = 0;i < SPECSIZE;i++) {
260 260
261 newspec[i] +=EPS; 261 newspec[i] +=EPS;
262 oldspec[i] +=EPS; 262 oldspec[i] +=EPS;
263 263
264 sumnew+=newspec[i]; 264 sumnew+=newspec[i];
265 sumold+=oldspec[i]; 265 sumold+=oldspec[i];
266 } 266 }
267 267
268 for (unsigned int i = 0;i < SPECSIZE;i++) { 268 for (int i = 0;i < SPECSIZE;i++) {
269 269
270 newspec[i] /= (sumnew); 270 newspec[i] /= (sumnew);
271 oldspec[i] /= (sumold); 271 oldspec[i] /= (sumold);
272 272
273 // IF ANY SPECTRAL VALUES ARE 0 (SHOULDN'T BE ANY!) SET THEM TO 1 273 // IF ANY SPECTRAL VALUES ARE 0 (SHOULDN'T BE ANY!) SET THEM TO 1