comparison src/midiEventHolder.cpp @ 12:5897a5626f1f

gave prior to tempo so it prefers original speed

 	int numberOfMatchesFound = findLocalMatches(pitch);
 	setMatchLikelihoods(numberOfMatchesFound);
 	bayesStruct.calculatePosterior();
 	
 	//having found matches we have matches for new note and matches for previous notes
-	if (!confidenceWeightingUsed)
+	//if (!confidenceWeightingUsed)
 	findLocalTempoPairs();
-	else
-	findLocalTempoPairsWeightedForConfidence();
+	//else
+	//findLocalTempoPairsWeightedForConfidence();
 	
 	//bayesStruct.addGaussianNoiseToSpeedPosterior(10);
 	 
 }
 

 			matchString += "["+ofToString(startIndex)+"] = "+ofToString(confidence, 3)+" .";
 			
 			if (abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate) < tmpError){
 				//record the error between expected and observed times
 				tmpError = abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate);
-				minimumMatchError = recordedEventTimes[startIndex] - bayesStruct.bestEstimate;
+				minimumMatchError = tmpError;//recordedEventTimes[startIndex] - bayesStruct.bestEstimate;
 			}
 			
 		}
 		startIndex++;
 	}

 				
 				//we want the speed of the recording relative to that of the playing live
 				
 				double speedRatio = recordedTimeDifference / playedTimeDifference;
 				if (speedRatio <= maximumMatchSpeed && speedRatio >= minimumMatchSpeed){
+					//adding in a prior that prefers 1
+					double priorWeighting = sin(speedRatio * PI/2);
+					
+					
 					/*
 					 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
 					double amount =	(1-bayesStruct.speedLikelihoodNoise)/10;
+					amount *= priorWeighting;
 					bayesStruct.updateTempoLikelihood(speedRatio, amount);
 					needToUpdate = true;
 				}
 				//		printf("\n");	
 			}