Mercurial > hg > multitrack-audio-matcher

diff src/AudioEventMatcher.h @ 35:6fb77b20413c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updating multimatcher for euclidean distance in chroma too
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Sun, 08 Apr 2012 18:59:30 +0100
parents 4be22a1a0e24
children 9806a4f22fd0
line wrap: on
line diff
--- a/src/AudioEventMatcher.h	Tue Apr 03 13:13:38 2012 +0100
+++ b/src/AudioEventMatcher.h	Sun Apr 08 18:59:30 2012 +0100
@@ -56,7 +56,10 @@
 	void matchNewPitchEvent(const int& channel, const double& pitchIn, const double& timeIn);
 	void matchNewOnsetEvent(const int& channel, const double& timeIn);
 	void matchNewChromaEvent(const int& channel, float* chroma, const double& timeIn);
-	double getChromaDistance(float* chromaOne, float* chromaTwo);
+
+	double getChromaDotProductDistance(float* chromaOne, float* chromaTwo);
+	double getChromaEuclideanDistance(float* chromaOne, float* chromaTwo);
+	bool useChromaDotProduct;
 	
 	BayesianArrayStructure bayesianStruct;//hold the probability distriubtions