comparison src/AudioEventMatcher.cpp @ 35:6fb77b20413c

updating multimatcher for euclidean distance in chroma too

 const int matchWindowWidth = 6000;
 const float pitchCutOff = 16;//within which pitches are even considered
 
 AudioEventMatcher::AudioEventMatcher(){
 
+	useChromaDotProduct = false;
 	
 	pitchLikelihoodToNoise = 0.6;//more noise
 	chromaLikelihoodToNoise = 0.5;//lower => more noise, higher more weight for events
 	chromaLikelihoodWidth = 50;//ms round onset event
 	

 	usingRealTime = false;
 	bayesianStruct.realTimeMode = &usingRealTime;
 	recentPitch = 0;
 	currentAlignmentPosition = 0;
 
-
-	
 	followingLiveInput = true;
 	startedPlaying = false;
 	recordedTempoIndex = 0;
 //	temporal.setUpEventTimeMatrix();
 //	recordedTempoData.setUpEventTimeMatrix();

 		
 		for (int i = checkIndex;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size() && millisTime <= endMatchingTime;i++){
 			millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime;
 			
 			if (millisTime >= startMatchingTime && millisTime <= endMatchingTime){
-				quantity = getChromaDistance(chromaIn, &recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].chromaValues[0]);
+				
+				if (useChromaDotProduct)
+					quantity = getChromaDotProductDistance(chromaIn, &recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].chromaValues[0]);
+				else
+					quantity = getChromaEuclideanDistance(chromaIn, &recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].chromaValues[0]);
+				
+				
 				bayesianStruct.likelihood.addGaussianShapeFromRealTime(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime, chromaLikelihoodWidth, quantity);
 				
 			//	bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth,  quantity);
 				numberOfMatches++;
 				totalLikelihoodAdded += quantity;

 	}
 	
 }
 
 
-double AudioEventMatcher::getChromaDistance(float* chromaOne, float* chromaTwo){
+double AudioEventMatcher::getChromaDotProductDistance(float* chromaOne, float* chromaTwo){
 	double distance = 0;
 	double total = 0;
 	for (int i = 0;i < 12;i++){
 		distance += chromaOne[i]*chromaTwo[i];
 		total += chromaOne[i]*chromaOne[i] + (chromaTwo[i]*chromaTwo[i]);
 	}
 	
-	distance /= sqrt(total);
+	if (total > 0)
+		distance /= sqrt(total);
+	
+	return distance;
+}
+
+double AudioEventMatcher::getChromaEuclideanDistance(float* chromaOne, float* chromaTwo){
+	double distance = 0;
+	double total = 0;
+//	printf("\n");
+	for (int i = 0;i < 12;i++){
+		total += (chromaOne[i] - chromaTwo[i])*(chromaOne[i] - chromaTwo[i]);
+//		printf("chroma1: %.2f; chroma2: %.2f\n", chromaOne[i], chromaTwo[i]);
+	//	total += chromaOne[i]*chromaOne[i] + (chromaTwo[i]*chromaTwo[i]);
+	}
+	
+	if (total > 0)
+		distance = 1.0/sqrt(total);
+//	printf("DISTANCE : %.3f\n", distance);
 	return distance;
 }
 
 void AudioEventMatcher::windowResized(const int& w, const int& h){
 	recordedTracks.windowResized(w,h);