comparison src/midiEventHolder.cpp @ 2:5581023e0de4

Added separate CannamMidiFileLoader class to handle the loading in.

 	noteMinimum = 30;
 	noteMaximum = 96;
 	
 	minimumMatchSpeed = 0.7;
 	maximumMatchSpeed = 1.3;
+
 	likelihoodWidth = 100;
-	likelihoodToNoiseRatio = 50;
-	
-	matchWindowWidth = 4000;//window size for matching in ms 
+	likelihoodToNoiseRatio = 0.02;
+	
+	bayesStruct.speedLikelihoodNoise = 0.05;//was 0.05
+	bayesStruct.speedDecayWidth = 20;
+	bayesStruct.speedDecayAmount = 10;
+	
+	
+	matchWindowWidth = 8000;//window size for matching in ms 
 	
 	bayesStruct.resetSize(matchWindowWidth);
+	bayesStruct.setPositionDistributionScalar(1);
+	
 	bayesStruct.resetSpeedSize(200);
 	bayesStruct.setRelativeSpeedScalar(0.01);
 	bayesStruct.relativeSpeedPrior.getMaximum();
-	bayesStruct.simpleExample();
+	//bayesStruct.simpleExample();
+	
 	
 	noteHeight = (*screenHeight) / (float)(noteMaximum - noteMinimum);
 }
 
 
 
 void midiEventHolder::reset(){
+	//called when we start playing
+	
 	noteArrayIndex = 0;
 	tickLocation = 0;
 	lastPeriodUpdateTime = ofGetElapsedTimeMillis();
 	bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
 	numberOfScreensIn = 0;

 	v.push_back(velocity);
 	playedNoteOnMatrix.push_back(v);
 
 	
 	//would update the arrays at this point to show where out current location (phase) and tempo is.
-	double timeNow = ofGetElapsedTimeMillis() - startTime;
-	recentNoteOnTime = timeNow;
-	
-	printf("Max time %f OF time %f \n", timePlayed, timeNow);
+//	double timeNow = ofGetElapsedTimeMillis() - startTime;
+	double timeNow = timePlayed;// - startTime;
+	recentNoteOnTime = timePlayed;
+	
+//	printf("Max time %f OF time %f \n", timePlayed, timeNow);
 	
 	playedEventTimes.push_back(timePlayed);
 	
-	double timeDifference = ofGetElapsedTimeMillis() - bayesStruct.lastEventTime; 
-	
+//	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);
 	//addnoise to the tempo distribution
-	bayesStruct.decaySpeedDistribution(timeDifference);
-
+	//bayesStruct.decaySpeedDistribution(timeDifference);
+	if (timeDifference > 50){
+	bayesStruct.addGaussianNoiseToSpeedPosterior(timeDifference * 10 / 100.);
+//	bayesStruct.addTriangularNoiseToSpeedPosterior(timeDifference * 10 / 100.);
+	}
+	
+	bayesStruct.updateTmpBestEstimate(timeDifference);// debug - didnt work	bayesStruct.bestEstimate = bayesStruct.tmpBestEstimate;
+	bayesStruct.updateBestEstimate();
+	bayesStruct.lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
 	
 //	double newMAPestimateTime = bayesStruct.posterior.getIndexInRealTerms(bayesStruct.posterior.MAPestimate);
 	//was offset + bayesStruct.posterior.MAPestimate; but this doesnt include scalar to convert to millis
 
 	timeString = "Pitch:"+ofToString(pitch);

 	timeString += " map "+ofToString(bayesStruct.relativeSpeedPosterior.MAPestimate, 1);
 	timeString += " rel speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate), 1);
 	
 	
 	//be able to draw the prior in correct location relative to the midi notes
+	//this calculates the cross update of all possible speeds and all possible positions
 	bayesStruct.crossUpdateArrays(bayesStruct.posterior, bayesStruct.relativeSpeedPosterior, timeDifference);
-//	bayesStruct.crossUpdateArrays(bayesStruct.prior, bayesStruct.relativeSpeedPosterior, timeDifference);
 
 	
 	timeString += " new OFF "+ofToString(bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2), 1);
 	timeString += " notearrayindex "+ofToString(noteArrayIndex, 0);
 	//when this is off teh screen there is a problem somehow XXX
 	bayesStruct.posterior.offset = max(0., bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));
 //	bayesStruct.prior.offset = max(0., bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));
 	//trying to switch to prior
 	
-	bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
+	//bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
+	bayesStruct.lastEventTime = timePlayed;
 	
 	//do the cross update to find current posterior for location
 //	totalConfidence= 0;
 	int numberOfMatchesFound = findLocalMatches(pitch);
 	setMatchLikelihoods(numberOfMatchesFound);
 	bayesStruct.calculatePosterior();
 	
 	//having found matches we have matches for new note and matches for previous notes
 	findLocalTempoPairs();
 	
-	
+	//bayesStruct.addGaussianNoiseToSpeedPosterior(10);
 	 
 }
 
 int midiEventHolder::findLocalMatches(int notePitch){
 

 void midiEventHolder::setMatchLikelihoods(int numberOfMatches){
 //reset the offset to match the prior
 	bayesStruct.likelihood.offset = bayesStruct.prior.offset;
 	bayesStruct.likelihood.zero();//set to zero
 	
-	
+	double quantity = likelihoodToNoiseRatio / numberOfMatches;
 	
 	for (int i = 0;i < numberOfMatches && matchesFound[i] >= 0 && matchesFound[i] < recordedEventTimes.size();i++){
 	//	printf("match times %i of %i::%f adding likelihood to %f\n", i, numberOfMatches, recordedEventTimes[matchesFound[i]], recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset);
 		//this is the vent time since start of file
 		if (recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset < bayesStruct.likelihood.arraySize){
 	//		double confidenceMeasure = 0;
 	//		if (totalConfidence > 0)
 		//		confidenceMeasure =	bayesStruct.posterior.getValueAtMillis(recordedEventTimes[matchesFound[i]])/totalConfidence;
-	
-			bayesStruct.likelihood.addGaussianShape(recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset, likelihoodWidth, 0.5 * likelihoodToNoiseRatio );//* confidenceMeasure
+			
+			bayesStruct.likelihood.addGaussianShape(recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset, likelihoodWidth,  quantity);//* confidenceMeasure
 		}//end if
 	}
-	bayesStruct.likelihood.addConstant(0.01);
+	bayesStruct.likelihood.addConstant((1-likelihoodToNoiseRatio)/bayesStruct.likelihood.length);
 }
 
 int midiEventHolder::findMatch(const int& notePitch, const int& startTime, const int& endTime){
 
 	matchesFound.clear();

 				
 				//we want the speed of the recording relative to that of the playing live
 				
 				double speedRatio = recordedTimeDifference / playedTimeDifference;
 				if (speedRatio <= maximumMatchSpeed && speedRatio >= minimumMatchSpeed){
-								printf("(%i)", matchMatrix[currentPlayedIndex][i+1]);
+						/*
+						 printf("(%i)", matchMatrix[currentPlayedIndex][i+1]);
 								printf("[%i] :: ", recordedPreviousIndex);
 								printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
 								printf("update on speed ratio %f\n", speedRatio);
+						 */
 					//	matchString += " speed: "+ofToString(speedRatio, 3);
 				//	commented for debug
-					bayesStruct.updateTempoDistribution(speedRatio, 0.1);//second paramter is confidence in the match
+					
+						 bayesStruct.updateTempoDistribution(speedRatio, 0.1);//second paramter is confidence in the match
 			
 				}
 	//		printf("\n");	
 			}
 			
 			previousIndex--;
 		}//end while previousindex countdown
 	}//end for loop through possible current matches
 	
-		
+	//printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
 }
 
 
 void midiEventHolder::updatePlayPosition(){
 	

 		int xLocation;// = getLocationFromTicks(tickLocation);
 	//	ofLine(xLocation, 0, xLocation, (*screenHeight));
 		
 		//orange line at best estimate
 		xLocation = getLocationFromMillis(bayesStruct.bestEstimate);
+		ofSetColor(250,100,0);
+		ofLine(xLocation, 0, xLocation, (*screenHeight));
+		
+		xLocation = getLocationFromMillis(bayesStruct.tmpBestEstimate);
 		ofSetColor(250,100,0);
 		ofLine(xLocation, 0, xLocation, (*screenHeight));
 		
 		
 		//lines where matching window start and end are 

 	
 	ofSetColor(0, 0, 0);
 	ofDrawBitmapString(matchString, 20, ofGetHeight() - 20);
 	
 	double confidence = bayesStruct.posterior.getValueAtMillis(mouseX);
-	string mouseString = "mouseX "+ofToString(confidence, 3)+" .";
+/*
+ string mouseString = "mouseX "+ofToString(confidence, 3)+" .";
 	ofDrawBitmapString(mouseString, 20 ,  ofGetHeight() - 40);
+*/	
+	string mouseString = "updateCounter "+ofToString(bayesStruct.updateCounter);
+	ofDrawBitmapString(mouseString, 20 ,  ofGetHeight() - 40);
+	
+	string infostring = "speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate), 3);
+	ofDrawBitmapString(infostring, 20 ,  ofGetHeight() - 60);							   
 }
 
 int midiEventHolder::getLocationFromTicks(double tickPosition){
 	return (int)((float)(tickPosition - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen);
 }

 }
 
 
 void midiEventHolder::setStartPlayingTimes(){
 	lastPeriodUpdateTime = ofGetElapsedTimeMillis();
-	bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
 	startTime = lastPeriodUpdateTime;
 	
+/*	
+ 	bayesStruct.lastEventTime = 0;//ofGetElapsedTimeMillis();
+	bayesStruct.bestEstimate = 0;
 	bayesStruct.resetArrays();
-//	bayesStruct.lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
+	bayesStruct.lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
+*/
+	bayesStruct.setStartPlaying();
 	matchString = "";
 }
 
 
 void midiEventHolder::printMatchMatrix(){