comparison src/midiEventHolder.cpp @ 10:2ab6f4670cf5

added in the best estimate of error between the observed midi note and the aligned midi track.

 	bayesStruct.setNewDistributionOffsets(max(0., bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2)));
 //	bayesStruct.prior.offset = max(0.,newMAPestimateTime - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));
 	
 	timeString += " \n :  new offset " + ofToString(bayesStruct.prior.offset , 0);
 	timeString += " \n best estimate "+ofToString(bayesStruct.bestEstimate, 1);
+	timeString += " error "+ofToString(minimumMatchError, 0);
 	timeString += " map "+ofToString(bayesStruct.relativeSpeedPosterior.integratedEstimate, 1);
 	timeString += " rel speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.integratedEstimate), 1);
 	
 	
 	//be able to draw the prior in correct location relative to the midi notes

 
 int midiEventHolder::findMatch(const int& notePitch, const int& startTime, const int& endTime){
 
 	matchesFound.clear();
 	int startIndex = 0;
-	
+
 	if (recordedEventTimes.size() > 0){
 	
 		//get to the right range of events to check in
 		while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < startTime)
 			startIndex++;
 		   
 		}
 
 	IntVector v;
 	DoubleVector d;
+	double tmpError = 100000.;//v high error
 	
 	double minimumConfidence = 0;
 	while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < endTime){
 		if (recordedNoteOnMatrix[startIndex][1] == notePitch){
 			

 			d.push_back(eventConfidence);
 			
 			double confidence = eventConfidence;//bayesStruct.posterior.getValueAtMillis(mouseX);
 	//																   recordedEventTimes[startIndex]);
 			matchString += "["+ofToString(startIndex)+"] = "+ofToString(confidence, 3)+" .";
+			
+			if (abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate) < tmpError){
+				//record the error between expected and observed times
+				tmpError = abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate);
+				minimumMatchError = recordedEventTimes[startIndex] - bayesStruct.bestEstimate;
+			}
+			
 		}
 		startIndex++;
 	}