annotate maths/CosineDistance.cpp @ 73:dcb555b90924

* Key detector: when returning key strengths, use the peak value of the three underlying chromagram correlations (from 36-bin chromagram) corresponding to each key, instead of the mean. Rationale: This is the same method as used when returning the key value, and it's nice to have the same results in both returned value and plot. The peak performed better than the sum with a simple test set of triads, so it seems reasonable to change the plot to match the key output rather than the other way around. * FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest rather than leaving them (perhaps dangerously) undefined. Fixes an uninitialised data error in chromagram that could cause garbage results from key detector. * Constant Q: remove precalculated values again, I reckon they're not proving such a good tradeoff.
author cannam
date Fri, 05 Jun 2009 15:12:39 +0000
parents dfe38135e4c7
children 769da847732b
rev   line source
cannam@31 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
cannam@31 2
cannam@31 3 /*
cannam@31 4 QM DSP Library
cannam@31 5
cannam@31 6 Centre for Digital Music, Queen Mary, University of London.
cannam@31 7 This file copyright 2008 Kurt Jacobson.
cannam@31 8 All rights reserved.
cannam@31 9 */
cannam@31 10
cannam@31 11 #include "CosineDistance.h"
cannam@31 12
cannam@31 13 #include <iostream>
cannam@31 14 #include <limits>
cannam@31 15
cannam@31 16 using std::cerr;
cannam@31 17
cannam@31 18 double CosineDistance::distance(const vector<double> &v1,
cannam@31 19 const vector<double> &v2)
cannam@31 20 {
cannam@31 21 dist = 1.0; dDenTot = 0; dDen1 = 0; dDen2 = 0; dSum1 =0;
cannam@31 22
cannam@31 23 //check if v1, v2 same size
cannam@31 24 if (v1.size() != v2.size())
cannam@31 25 {
cannam@31 26 cerr << "CosineDistance::distance: ERROR: vectors not the same size\n";
cannam@31 27 return 1.0;
cannam@31 28 }
cannam@31 29 else
cannam@31 30 {
cannam@31 31 for(int i=0; i<v1.size(); i++)
cannam@31 32 {
cannam@31 33 dSum1 += v1[i]*v2[i];
cannam@31 34 dDen1 += v1[i]*v1[i];
cannam@31 35 dDen2 += v2[i]*v2[i];
cannam@31 36 }
cannam@31 37 dDenTot = sqrt(fabs(dDen1*dDen2));
cannam@31 38 if(dDenTot == 0)
cannam@31 39 {
cannam@31 40 cerr << "CosineDistance::distance: WARNING: dividing by zero in cosine dist\n";
cannam@31 41 return 1.0;
cannam@31 42 }
cannam@31 43
cannam@31 44 dist = 1-((dSum1)/dDenTot);
cannam@31 45 return dist;
cannam@31 46 }
cannam@31 47 }