diff bayesianArraySrc/BayesianArrayStructure.cpp @ 7:33dedfe32893

kick, snare and bass windowed. Likelihoods in dedicated screen regions

--- a/bayesianArraySrc/BayesianArrayStructure.cpp	Thu Feb 02 17:52:08 2012 +0000
+++ b/bayesianArraySrc/BayesianArrayStructure.cpp	Thu Feb 02 21:55:51 2012 +0000
@@ -16,6 +16,7 @@
 	printf("Bayesian structure: DeFault constructor called");
 
 	usingIntegratedTempoEstimate = false;// use max index
+	updatingSpeedDistribution = false;
 	
 	relativeSpeedLikelihoodStdDev = 5.0;
 	
@@ -104,7 +105,8 @@
 	relativeSpeedPosterior.zero();
 	relativeSpeedPosterior.addGaussianShape(index, priorWidth, 0.8);
 	printf("speed adding to index for 1 = %f\n", relativeSpeedPosterior.getRealTermsAsIndex(1));
-	relativeSpeedPosterior.addToIndex(relativeSpeedPosterior.getRealTermsAsIndex(1), 1);
+	relativeSpeedPosterior.addToIndex(relativeSpeedPosterior.getRealTermsAsIndex(1), 0.1);
+	relativeSpeedPosterior.addGaussianShapeFromRealTime(1, 3, 0.5);
 	
 	relativeSpeedPosterior.renormalise();
 	relativeSpeedPosterior.getMaximum();
@@ -163,8 +165,8 @@
 	int zeroIndex = posterior.getRealTermsAsIndex(0);
 	printf("ZERO INDEX %i\n", zeroIndex);
 	
-	posterior.addGaussianShapeFromRealTime(0, 500, 1);//one way to add at x msec
-	posterior.addGaussianShape(posterior.getRealTermsAsIndex(10), 50, 1);//alternative way
+	posterior.addGaussianShapeFromRealTime(0, 60, 1);//one way to add at x msec
+//	posterior.addGaussianShape(posterior.getRealTermsAsIndex(10), 50, 1);//alternative way
 	
 	//posterior.addToIndex(0, 1);
 	likelihood.addConstant(1);
@@ -288,7 +290,7 @@
 	//addnoise to the tempo distribution
 	//bayesianStruct.decaySpeedDistribution(timeDifference);
 	
-	if (timeDifference > 50){
+	if (timeDifference > 50 && updatingSpeedDistribution){
 		addGaussianNoiseToSpeedPosterior(timeDifference * 10.0 / 100.);
 	}