comparison src/AudioEventMatcher.cpp @ 14:0a52258accec

tmp commit

 	
 	usingRealTime = false;
 	bayesianStruct.realTimeMode = &usingRealTime;
 	recentPitch = 0;
 	currentAlignmentPosition = 0;
+
+	onsetLikelihoodWidth = 20;
 	
 	followingLiveInput = true;
 }
+
 
 void AudioEventMatcher::setWindowDimensions(){
 	double startHeight = recordedTracks.numberOfAudioTracks * recordedTracks.trackScreenHeight;
 	double heightAvailable = 1 - startHeight;
 	heightAvailable /= 3.0;

 	bayesianStruct.updateBayesianDistributions(timeIn);//moves the posterior up into prior given the time interval and calculates new offsets
 
 	//start at beginning but OPTIMISE later
 	double onsetLikelihoodToNoise = 0.3;
 	
-	double likelihoodWidth = 40;
-	
 	bayesianStruct.likelihood.offset = bayesianStruct.prior.offset;
 	bayesianStruct.likelihood.zero();//set to zero
 	
 	double quantity = 1;//likelihoodToNoiseRatio / numberOfMatches;
 	int numberOfMatchesFound = 0;

 	
 	if (channel <= recordedTracks.numberOfAudioTracks){
 		for (int i = 0;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size();i++){
 			double millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime;
 			if (millisTime >= startMatchingTime && millisTime <= endMatchingTime){
-				bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, likelihoodWidth,  quantity);
+				bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth,  quantity);
 				numberOfMatchesFound++;
 		//		printf("Adding Gaussian for onset at time %f offset %f\n", millisTime, bayesianStruct.likelihood.offset);
 				
 			}
 		}