annotate maths/CosineDistance.cpp @ 321:f1e6be2de9a5

A threshold (delta) is added in the peak picking parameters structure (PPickParams). It is used as an offset when computing the smoothed detection function. A constructor for the structure PPickParams is also added to set the parameters to 0 when a structure instance is created. Hence programmes using the peak picking parameter structure and which do not set the delta parameter (e.g. QM Vamp note onset detector) won't be affected by the modifications. Functions modified: - dsp/onsets/PeakPicking.cpp - dsp/onsets/PeakPicking.h - dsp/signalconditioning/DFProcess.cpp - dsp/signalconditioning/DFProcess.h
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 20 Jun 2011 19:01:48 +0100
parents d5014ab8b0e5
children e4a57215ddee
rev   line source
c@256 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@256 2
c@256 3 /*
c@256 4 QM DSP Library
c@256 5
c@256 6 Centre for Digital Music, Queen Mary, University of London.
c@256 7 This file copyright 2008 Kurt Jacobson.
c@309 8
c@309 9 This program is free software; you can redistribute it and/or
c@309 10 modify it under the terms of the GNU General Public License as
c@309 11 published by the Free Software Foundation; either version 2 of the
c@309 12 License, or (at your option) any later version. See the file
c@309 13 COPYING included with this distribution for more information.
c@256 14 */
c@256 15
c@256 16 #include "CosineDistance.h"
c@256 17
c@256 18 #include <iostream>
c@256 19 #include <limits>
c@256 20
c@256 21 using std::cerr;
c@256 22
c@256 23 double CosineDistance::distance(const vector<double> &v1,
c@256 24 const vector<double> &v2)
c@256 25 {
c@256 26 dist = 1.0; dDenTot = 0; dDen1 = 0; dDen2 = 0; dSum1 =0;
c@299 27 double small = 1e-20;
c@256 28
c@256 29 //check if v1, v2 same size
c@256 30 if (v1.size() != v2.size())
c@256 31 {
c@256 32 cerr << "CosineDistance::distance: ERROR: vectors not the same size\n";
c@256 33 return 1.0;
c@256 34 }
c@256 35 else
c@256 36 {
c@256 37 for(int i=0; i<v1.size(); i++)
c@256 38 {
c@256 39 dSum1 += v1[i]*v2[i];
c@256 40 dDen1 += v1[i]*v1[i];
c@256 41 dDen2 += v2[i]*v2[i];
c@256 42 }
c@299 43 dDenTot = sqrt(fabs(dDen1*dDen2)) + small;
c@256 44 dist = 1-((dSum1)/dDenTot);
c@256 45 return dist;
c@256 46 }
c@256 47 }