comparison src/midiEventHolder.cpp @ 15:9e972948d654

looking at offline version - need to do updateBestEstimate routine which presently only works for realtime

  *
  *  Created by Andrew on 19/07/2011.
  *  Copyright 2011 QMUL. All rights reserved.
  *
  */
-//hello
 
 #include "midiEventHolder.h"
 
 midiEventHolder::midiEventHolder(){
 //	recordedNoteOnIndex = 0;

 	playedEventTimes.push_back(timePlayed);
 	
 //	double timeDifference = ofGetElapsedTimeMillis() - bayesStruct.lastEventTime; 
 	double timeDifference = timePlayed - bayesStruct.lastEventTime; 
 	
-//	printf("note %i played at %f and last event %f\n", pitch, timePlayed, bayesStruct.lastEventTime);
+	
+	
+	printf("note %i played at %f and last event %f time difference %f and current best estmate %f\n", pitch, timePlayed, bayesStruct.lastEventTime, timeDifference, bayesStruct.bestEstimate);
 	//addnoise to the tempo distribution
 	//bayesStruct.decaySpeedDistribution(timeDifference);
 	if (timeDifference > 50){
 	bayesStruct.addGaussianNoiseToSpeedPosterior(timeDifference * 10 / 100.);
 //	bayesStruct.addTriangularNoiseToSpeedPosterior(timeDifference * 10 / 100.);

 	//here we find the matches to the new note within appropriate range
 		
 	matchString = "";
 	
 	windowStartTime = max(0.0,(bayesStruct.bestEstimate - matchWindowWidth/2));//was playPositionInMillis
+	cout << "best estimate is " << bayesStruct.bestEstimate << endl;
 	int numberOfMatches = findMatch(notePitch, windowStartTime, windowStartTime + matchWindowWidth);
 
 	
 	matchString += " pitch: "+ofToString(notePitch)+" matches "+ofToString(numberOfMatches)+" win start "+ofToString(windowStartTime);	
 	

 	 
 	
 	matchMatrix.push_back(v);
 	matchConfidence.push_back(d);
 	
-	printf("BEST MATCH TO note %i,time %i is recorded time %i, confidence %0.2f\n", notePitch, startTime, (int) recordedEventTimes[bestMatchIndex], minimumConfidence);
+	printf("BEST MATCH TO note %i, start time %i, endtime %i, time %i is recorded time %i, confidence %0.2f\n", notePitch, startTime, endTime, (int) recordedEventTimes[bestMatchIndex], minimumConfidence);
 	
 	return size;
 }
 
 bool midiEventHolder::checkIfMatchedNote(const int& tmpIndex){

 	//in actual fact if we are changing the speed of the play position 
 	//we will need to update this via the file
 	
 	//actually time since beginning of file i think
 	
-	double timeDifference = ofGetElapsedTimeMillis() - lastPeriodUpdateTime;//elpased - lastperiodupdatetime
+	double timeDifference = 0;
+	if (runningInRealTime)
+		timeDifference = ofGetElapsedTimeMillis() - lastPeriodUpdateTime;//elpased - lastperiodupdatetime
+	
 	//this is time diff in milliseconds
 	//then we have 
 	double quarterNoteIntervals = (timeDifference / period);
 	tickLocation = quarterNoteIntervals * pulsesPerQuarternote;