comparison src/AudioEventMatcher.cpp @ 37:9806a4f22fd0

Fixed bugs in the likelohoods that caused some to zero when no events found.

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

 	temporal.tempoPosterior.addGaussianShapeFromRealTime(recordedTempo, 2000, 1);
 	
 	//SET TEMPO PRIOR for Speed Ratio
 	//the update this
 	setSpeedRatioDistribution(currentSpeedRatio);
+	
+	euclideanMaximumDistance = 0;
+	
 	//bayesianStruct.posterior.printArray();
 }
 
 
 void AudioEventMatcher::setSpeedRatioDistribution(const double& speedRatio){

 	bayesianStruct.relativeSpeedPosterior.addGaussianShapeFromRealTime(1, 0.06, 0.8);
 }
 
 void AudioEventMatcher::stopPlaying(){
 	startedPlaying = false;
-	temporal.printEventTimes();
+	//temporal.printEventTimes();
 }
 
 void AudioEventMatcher::rescue(){
 	bayesianStruct.posterior.zero();
 	bayesianStruct.posterior.addConstant(1);

 	temporal.tempoPosterior.addGaussianShape(temporal.tempoPosterior.MAPestimate, temporal.tempoArraySize / 4, 0.5	);
 }
 
 void AudioEventMatcher::updateRecordedTempo(){
 	//tempo of equivalent recorded position is updated 
+	if (recordedTempoIndex < recordedTempoData.globalTempoTimes.size()){//if for debug
 	while(currentAlignmentPosition > recordedTempoData.globalTempoTimes[recordedTempoIndex]){
 		recordedTempoIndex++;
 	}
 	recordedTempo = recordedTempoData.globalTempo[recordedTempoIndex];
 	double tmpRatio = currentSpeedRatio;
 	currentSpeedRatio = temporal.playingTempo / recordedTempo;
 	if (currentSpeedRatio != tmpRatio)
 		setSpeedRatioDistribution(currentSpeedRatio);
+	
+	}//end if to prevent debug crash
 }
 
 void AudioEventMatcher::updateBestAlignmentPosition(){
 	//THIS DEALS WITH WHERE WE ARE NOW! ON THE SCREEN
 	//DIFFERENT TO WHEN EVENTS COME IN AS THEY ARE TIMESTAMPED - SO EG A PITCH EVENT MAY ARRIVE 16 CHROMA FRAMES LATER - BIG DIFFERENCE

 	bayesianStruct.prior.drawConstrainedVector(bayesianStruct.prior.getRealTermsAsIndex(screenStartTimeMillis), bayesianStruct.prior.getRealTermsAsIndex(screenEndTimeMillis), 0, ofGetWidth(), bayesPositionWindow);
 	
 	ofSetColor(255,0,0);//projected prior in red
 	projectedPrior.drawConstrainedVector(bayesianStruct.prior.getRealTermsAsIndex(screenStartTimeMillis), bayesianStruct.prior.getRealTermsAsIndex(screenEndTimeMillis), 0, ofGetWidth(), bayesPositionWindow);
 	
-	
-	
+	//draw pitch
+	ofSetColor(0,100,255);
+	int index = getScreenWidthIndexOfEventTime(recentPitchEventTime);
+	//this window would be used (recordedTracks.loadedAudioFiles[1].fileLoader.onsetDetect.window);
+	
+	
+}
+
+int AudioEventMatcher::getScreenWidthIndexOfEventTime(const double& time){
+	return (time - screenStartTimeMillis)*ofGetWidth()/screenWidthMillis;
 }
 
 void AudioEventMatcher::drawTrackLikelihoods(){
 	//draw track by track likelihoods
 	for (int i = 0; i <recordedTracks.numberOfAudioTracks;i++){

 	
 	ofSetColor(255);
 	tmpStr = "pitch "+ofToString(recentPitch, 2);
 	tmpStr += " Nearest "+ofToString(pitchOfNearestMatch,2);
 	tmpStr += " dist "+ofToString(distanceOfNearestMatch, 2);
-	tmpStr +=  ", Time "+ofToString(recentTime, 0);
+	tmpStr +=  ", Time "+ofToString(recentPitchEventTime, 0);
 	ofDrawBitmapString(tmpStr, 20, 20);
 	
 	string alignString = " align "+ofToString(currentAlignmentPosition, 2);
 	alignString += " playing "+ofToString(synchroniser.playingPositionRatio, 5);
 	alignString += "  pos "+ofToString(synchroniser.playingPositionMillis,0)+" ms";

 	matchNewPitchEvent(channel, pitchIn, timeIn);//main pitch matching fn
 
 	likelihoodVisualisation[1] = bayesianStruct.likelihood;
 		
 	recentPitch = pitchIn;//for drawing
-	recentTime = timeIn;
+	recentPitchEventTime = timeIn;
 	}
 }
 
 
 void AudioEventMatcher::newChromaEvent(const int& channel, float* chromaIn, const double& timeIn){
 	
 	//	could add event to the liveInput list? as in pitch event
-	printf("match chroma channel %i\n", channel);	
-	for (int i = 0;i < 12;i++){
+	if (printingData){
+		printf("match chroma channel %i\n", channel);	
+		for (int i = 0;i < 12;i++){
 		printf("chroma in[%i] = %f\n", i, chromaIn[i]);
+		}
 	}
 	
 	matchNewChromaEvent(channel, chromaIn, timeIn);//main pitch matching fn
 	
 	likelihoodVisualisation[channel] = bayesianStruct.likelihood;

 		}
 	}
 
 	
 	
-	if (numberOfMatches > 0){//no point updating unless there is a match
+	if (numberOfMatches > 0 && totalLikelihoodAdded > 0){//no point updating unless there is a match
 	//replacing numberOfMatches with totalLike below...
-		bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-pitchLikelihoodToNoise)/(pitchLikelihoodToNoise*bayesianStruct.likelihood.length));
+		//bug here was that if totaladded = 0, we add then zero likelihood
+		bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-pitchLikelihoodToNoise)/(bayesianStruct.likelihood.length));
+	//	bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-pitchLikelihoodToNoise)/(pitchLikelihoodToNoise*bayesianStruct.likelihood.length));
 
 	//tmp set likelihood constant and calculate using that
 	//bayesianStruct.likelihood.zero();
 	//bayesianStruct.likelihood.addConstant(1);
 		

 	double startMatchingTime = bayesianStruct.likelihood.offset;
 	double endMatchingTime = bayesianStruct.likelihood.offset + matchWindowWidth;
 	double millisTime = -1*INFINITY;//or 0 is fine
 	
 	int checkIndex = 0;
-	if (channel <= recordedTracks.numberOfAudioTracks){
+	if (channel <= recordedTracks.numberOfAudioTracks && checkIndex < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size()){
+
 		while (millisTime < startMatchingTime) {
 			millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[checkIndex].millisTime;
 			checkIndex++;
 		}//go up to where we need to check from fast
 		

 				bayesianStruct.likelihood.addGaussianShapeFromRealTime(recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime, chromaLikelihoodWidth, quantity);
 				
 			//	bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth,  quantity);
 				numberOfMatches++;
 				totalLikelihoodAdded += quantity;
-				printf("Adding CHROMA Gaussian for onset at time %.1f dist %.3f\n", millisTime, quantity);
+				
+				//printf("Adding CHROMA Gaussian for onset at time %.1f dist %.3f\n", millisTime, quantity);
 				
 			}//end if within limits (changed so it now is 4 sure)
 		}
 	}
 	
 	
-	if (numberOfMatches > 0){//no point updating unless there is a match
+	if (numberOfMatches > 0 && totalLikelihoodAdded > 0){//no point updating unless there is a match
 		//replacing numberOfMatches with totalLike below...
 		
 		printf("CHROMA HAS %i MATCHES\n", numberOfMatches);
 		
-		bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-chromaLikelihoodToNoise)/(chromaLikelihoodToNoise*bayesianStruct.likelihood.length));
+		bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-chromaLikelihoodToNoise)/(bayesianStruct.likelihood.length));
+	//previous way	
+	//	bayesianStruct.likelihood.addConstant(totalLikelihoodAdded*(1-chromaLikelihoodToNoise)/(chromaLikelihoodToNoise*bayesianStruct.likelihood.length));
 		
 		bayesianStruct.calculatePosterior();
 		lastAlignmentTime = timeIn;//has to use the STAMPED time
 		recentEventTime[channel] = timeIn;
 		

 }
 
 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);
+	if (total > euclideanMaximumDistance)
+		euclideanMaximumDistance = total;
+	
+	distance = ((euclideanMaximumDistance - total)/ euclideanMaximumDistance);//i.e. 1 is 
+	
+//	if (total > 0)
+		
+		
+//		distance = 1.0/sqrt(total);
 //	printf("DISTANCE : %.3f\n", distance);
 	return distance;
 }
 
 void AudioEventMatcher::windowResized(const int& w, const int& h){