comparison src/AudioEventMatcher.cpp @ 36:eb43b2a007ea

changed newMatchOnset to have different way to calculate onsets vs noise, using the onsetLikelihoodNoise factor

  */
 
 #include "AudioEventMatcher.h"
 
 
-const int matchWindowWidth = 6000;
+const int matchWindowWidth = 8000;
 const float pitchCutOff = 16;//within which pitches are even considered
 
 AudioEventMatcher::AudioEventMatcher(){
 
 	useChromaDotProduct = false;
 	
 	pitchLikelihoodToNoise = 0.6;//more noise
 	chromaLikelihoodToNoise = 0.5;//lower => more noise, higher more weight for events
 	chromaLikelihoodWidth = 50;//ms round onset event
 	
-	onsetLikelihoodToNoise = 0.4;
+	onsetLikelihoodToNoise = 0.1;
 	onsetLikelihoodWidth = 10;//in ms
 	
 	setArraySizes();
 	
 	usingRealTime = false;

 	bayesianStruct.resetSpeedSize(200);
 	bayesianStruct.setRelativeSpeedScalar(0.01);
 	bayesianStruct.setSpeedPrior(1.0);
 	bayesianStruct.relativeSpeedPrior.getMaximum();
 	
-	bayesianStruct.resetSize(matchWindowWidth);
-	bayesianStruct.setPositionDistributionScalar(1);
+	float scalarForBayesianDistribution = 2;
+	
+	bayesianStruct.resetSize(matchWindowWidth / scalarForBayesianDistribution);
+	bayesianStruct.setPositionDistributionScalar(2);
 	
 }
 
 void AudioEventMatcher::loadAudioFiles(){
 	recordedTracks.loadTestAudio();

 	recordedTempo = recordedTempoData.globalTempo[recordedTempoIndex];
 	
 	currentSpeedRatio = 1;
 	
 	temporal.tempoPosterior.zero();
-	temporal.tempoPosterior.addGaussianShapeFromRealTime(recordedTempo, 10, 1);
+	temporal.tempoPosterior.addGaussianShapeFromRealTime(recordedTempo, 2000, 1);
 	
 	//SET TEMPO PRIOR for Speed Ratio
 	//the update this
 	setSpeedRatioDistribution(currentSpeedRatio);
 	//bayesianStruct.posterior.printArray();

 	bayesianStruct.updateBayesianDistributions(timeIn);//moves the posterior up into prior given the time interval and calculates new offsets
 
 	//start at beginning but OPTIMISE later
 	bayesianStruct.likelihood.offset = bayesianStruct.prior.offset;
 	bayesianStruct.likelihood.zero();//set to zero
-	
-	double quantity = 1;//likelihoodToNoiseRatio / numberOfMatches;
+	//double quantity = 1;//
+	double quantity = 1*onsetLikelihoodToNoise;//BETTER CHANGE THIS BACK TOO..see below//likelihoodToNoiseRatio / numberOfMatches;
 	int numberOfMatchesFound = 0;
 
 	double startMatchingTime = bayesianStruct.likelihood.offset;
 	double endMatchingTime = bayesianStruct.likelihood.offset + matchWindowWidth;
 	double millisTime = -1*INFINITY;//or 0 is fine
 	int checkIndex = 0;
-	if (channel <= recordedTracks.numberOfAudioTracks){
+	if (channel <= recordedTracks.numberOfAudioTracks && checkIndex < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size()){
 		while (millisTime < startMatchingTime) {
 			millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[checkIndex].millisTime;
 			checkIndex++;
 		}
 		for (int i = checkIndex;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size() && millisTime <= endMatchingTime;i++){

 		}
 	}
 	
 	if (numberOfMatchesFound > 0){
 //	bayesianStruct.likelihood.addConstant((1-likelihoodToNoiseRatio)/bayesianStruct.likelihood.length);
-	bayesianStruct.likelihood.addConstant(numberOfMatchesFound*(1-onsetLikelihoodToNoise)/(onsetLikelihoodToNoise*bayesianStruct.likelihood.length));
+//	bayesianStruct.likelihood.addConstant(numberOfMatchesFound*(1-onsetLikelihoodToNoise)/(onsetLikelihoodToNoise*bayesianStruct.likelihood.length));
+	bayesianStruct.likelihood.addConstant(numberOfMatchesFound*(1-onsetLikelihoodToNoise)/(bayesianStruct.likelihood.length));//BETTER CHANGE THIS BACK...
 	bayesianStruct.likelihood.renormalise();
 	
 	bayesianStruct.calculatePosterior();
 	lastAlignmentTime = timeIn;//use TIMESTAMP
 	recentEventTime[channel] = timeIn;//ofGetElapsedTimeMillis() - startTime;