comparison src/midiEventHolder.cpp @ 9:75dcd1308658

looked at tempo process, likelihood function changed and improved. Now drawing using constrained vector function. Good working version.

 	maximumMatchSpeed = 2.0;
 
 	likelihoodWidth = 100;
 	likelihoodToNoiseRatio = 0.02;
 	
-	bayesStruct.speedLikelihoodNoise = 0.02;//was 0.05
+	bayesStruct.speedLikelihoodNoise = 0.1;//was 0.05
 	bayesStruct.speedDecayWidth = 20;
 	bayesStruct.speedDecayAmount = 10;
 	
 	speedPriorValue = 1.0;
 	

 	speedWindowWidthMillis = 4000;
 	speedPriorValue = 1.0;
 	noteHeight = (*screenHeight) / (float)(noteMaximum - noteMinimum);
 	
 	confidenceWeightingUsed = false;
+	
+	drawPhaseMode = true;
 	
 	printf("lookup index %f value %f\n", bayesStruct.prior.getLookupIndex(100, 30., 10.0), bayesStruct.prior.gaussianLookupTable[(int)bayesStruct.prior.getLookupIndex(100, 30., 10.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\n", pitch, timePlayed, bayesStruct.lastEventTime);
 	//addnoise to the tempo distribution
 	//bayesStruct.decaySpeedDistribution(timeDifference);
 	if (timeDifference > 50){
 	bayesStruct.addGaussianNoiseToSpeedPosterior(timeDifference * 10 / 100.);
 //	bayesStruct.addTriangularNoiseToSpeedPosterior(timeDifference * 10 / 100.);

 	timeString += ", time now:"+ofToString(timeNow, 1);
 	timeString += "  TD "+ofToString(timeDifference, 1);
 	timeString += "  offset "+ofToString(bayesStruct.posterior.offset , 0);
 	timeString += " map Est: "+ofToString(bayesStruct.posterior.MAPestimate, 0); 
 //	timeString += " Previous time" + ofToString(newMAPestimateTime,0);
-	timeString += " speedMap "+ofToString(bayesStruct.relativeSpeedPosterior.MAPestimate, 2);
-	timeString += " :: "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate), 2);
+	timeString += " speedMap "+ofToString(bayesStruct.relativeSpeedPosterior.integratedEstimate, 2);
+	timeString += " :: "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.integratedEstimate), 2);
 	
 //	newMAPestimateTime += (timeDifference * bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
 //	timeString += " :  Predicted MAP time" + ofToString(newMAPestimateTime,0);
 
 	//then we recalculate the window start based on MAP being central

 	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 += " map "+ofToString(bayesStruct.relativeSpeedPosterior.MAPestimate, 1);
-	timeString += " rel speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate), 1);
+	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
 	//this calculates the cross update of all possible speeds and all possible positions
 	bayesStruct.crossUpdateArrays(bayesStruct.posterior, bayesStruct.relativeSpeedPosterior, timeDifference);

 	int currentPlayedIndex = playedNoteOnMatrix.size()-1;
 	//	printf("played %i : %i, vel %i\n", currentPlayedIndex, playedNoteOnMatrix[currentPlayedIndex][0], playedNoteOnMatrix[currentPlayedIndex][1]);
 	//	printMatchesFound();
 	//	printMatchMatrix();
 	//	printf("possible notes \n");
+	bool needToUpdate = false;
+	bayesStruct.setLikelihoodToConstant();
 	
 	
 	for (int i = 0;i < matchMatrix[currentPlayedIndex][0];i++){
 		//iterate through the recently matched events - even dodgy matches included
 		//size, index of match0, index of match1, ....
+		
+		
 		int recordedCurrentIndex = matchMatrix[currentPlayedIndex][i+1];
 		
 		int previousIndex = currentPlayedIndex-1;
+
 		
 		while (previousIndex >= 0 && playedEventTimes[previousIndex] + speedWindowWidthMillis > playedEventTimes[currentPlayedIndex]) {
 			double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
 			
 			for (int k = 0;k < matchMatrix[previousIndex][0];k++){

 					 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
+					double amount =	(1-bayesStruct.speedLikelihoodNoise)/10;
+					bayesStruct.updateTempoLikelihood(speedRatio, amount);
+					needToUpdate = true;
 				}
 				//		printf("\n");	
 			}
 			
 			previousIndex--;
 		}//end while previousindex countdown
 	}//end for loop through possible current matches
 	
+	if (needToUpdate)
+		bayesStruct.updateTempoDistribution();
+	
 	//printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
 }
 
 
 void midiEventHolder::findLocalTempoPairsWeightedForConfidence(){
+	bool needToUpdate = false;
 	
 	int currentPlayedIndex = playedNoteOnMatrix.size()-1;
 	//	printf("played %i : %i, vel %i\n", currentPlayedIndex, playedNoteOnMatrix[currentPlayedIndex][0], playedNoteOnMatrix[currentPlayedIndex][1]);
 	//	printMatchesFound();
 	//	printMatchMatrix();
 	//	printf("possible notes \n");
 	
+	bayesStruct.setLikelihoodToConstant();
 	
 	for (int i = 0;i < matchMatrix[currentPlayedIndex][0];i++){
 		//iterate through the recently matched events - even dodgy matches included
 		//size, index of match0, index of match1, ....
 		int recordedCurrentIndex = matchMatrix[currentPlayedIndex][i+1];

 					printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
 					 printf("update on speed ratio %f\n", speedRatio);
 					 
 					//	matchString += " speed: "+ofToString(speedRatio, 3);
 					//	commented for debug
-					double weighting = previousMatchConfidence * currentMatchConfidence * 0.1;
-					bayesStruct.updateTempoDistribution(speedRatio, weighting);//second paramter is confidence in the match
-					
+					double weighting = previousMatchConfidence * currentMatchConfidence ;
+					double amount =	(1-bayesStruct.speedLikelihoodNoise)*weighting/10;
+					bayesStruct.updateTempoLikelihood(speedRatio, amount);//second paramter is confidence in the match
+					needToUpdate = true;
 				}
 				//		printf("\n");	
 			}
 			
 			previousIndex--;
 		}//end while previousindex countdown
 	}//end for loop through possible current matches
 	
+	if (needToUpdate)
+		bayesStruct.updateTempoDistribution();
 	//printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
 }
 
 
 

 	bayesStruct.updateBestEstimate();
 	
 }
 
 
-void midiEventHolder::drawFile(){
+void midiEventHolder::drawMidiFile(){
+	
 	//draws midi file on scrolling screen
 	int size = recordedNoteOnMatrix.size();
 	if (size > 0){
 		
 		numberOfScreensIn = floor(bayesStruct.bestEstimate / getEventTimeMillis(ticksPerScreen));//rpounds down on no screens in
 		
-	//	numberOfScreensIn = tickLocation / ticksPerScreen;//rounds down
+		//	numberOfScreensIn = tickLocation / ticksPerScreen;//rounds down
 		timeOffsetForScreen = getEventTimeMillis(numberOfScreensIn * ticksPerScreen);
 		
 		while (noteArrayIndex < recordedNoteOnMatrix.size() && tickLocation > recordedNoteOnMatrix[noteArrayIndex][0] )
 			noteArrayIndex++;
 		

 		for (int tmpIndex = max(0,minNoteIndexToPrint);tmpIndex < min(maxNoteIndexToPrint, (int)recordedNoteOnMatrix.size());tmpIndex++){
 			
 			if (checkIfMatchedNote(tmpIndex))
 				ofSetColor(0,0,255);
 			else if(noteOnMatches[tmpIndex]){
-			ofSetColor(255,0,255);
+				ofSetColor(255,0,255);
 			}else{
 				ofSetColor(255,255,255);
 			}
-		
-			
-
-	//		 XXX replace ofgetwidth below
+			
+			
+			
+			//		 XXX replace ofgetwidth below
 			//if (tmpIndex >= 0 && tmpIndex < size)
 			int xLocation = (float)(recordedNoteOnMatrix[tmpIndex][0] - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen;
 			int duration = (float)(recordedNoteOnMatrix[tmpIndex][3]*(*screenWidth))/(float)ticksPerScreen;
 			
 			

 			
 		}
 		
 		
 		int xLocation;// = getLocationFromTicks(tickLocation);
-	//	ofLine(xLocation, 0, xLocation, (*screenHeight));
+		//	ofLine(xLocation, 0, xLocation, (*screenHeight));
 		
 		//orange line at best estimate
 		xLocation = getLocationFromMillis(bayesStruct.bestEstimate);
 		ofSetColor(250,100,0);
 		ofLine(xLocation, 0, xLocation, (*screenHeight));

 		ofSetColor(0,100,255);
 		xLocation = getLocationFromMillis(windowStartTime);
 		ofLine(xLocation, 0, xLocation, (*screenHeight));
 		xLocation = getLocationFromMillis(windowStartTime+matchWindowWidth);
 		ofLine(xLocation, 0, xLocation, (*screenHeight));
-		 
+		
 		
 	}	
 	
-	
-	
 	ofDrawBitmapString(ofToString(timeOffsetForScreen, 1), 20,20);
 	
 	ofDrawBitmapString(timeString, 20, 60);
+	
+	
+}
+
+void midiEventHolder::drawFile(){	
+		drawMidiFile();
+		
 	
 //	bayesStruct.drawArrays();
 	
 //	ofSetColor(200,200,0);
 //	bayesStruct.prior.drawConstrainedVector(0, bayesStruct.prior.arraySize, 400, 800);
 	
 	//need to draw arrays within correct timescope
+	if (drawPhaseMode)
 	bayesStruct.drawArraysRelativeToTimeframe(timeOffsetForScreen, timeOffsetForScreen + getEventTimeMillis(ticksPerScreen));
 	
 	if (drawTempoMode)
 	bayesStruct.drawTempoArrays();