comparison bayesianArraySrc/BayesianArrayStructure.cpp @ 7:33dedfe32893

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

 
 BayesianArrayStructure::BayesianArrayStructure(){
 	printf("Bayesian structure: DeFault constructor called");
 
 	usingIntegratedTempoEstimate = false;// use max index
+	updatingSpeedDistribution = false;
 	
 	relativeSpeedLikelihoodStdDev = 5.0;
 	
 	prior.createVector(1);
 	likelihood.createVector(1);

 	speedPriorValue = f;
 	int index = relativeSpeedPosterior.getRealTermsAsIndex(speedPriorValue);
 	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();
 	relativeSpeedPrior.copyFromDynamicVector(relativeSpeedPosterior);
 	printf("BAYES STRUCTU ' SPEED PRIOR %f . index %i\n", speedPriorValue, index);

 	setNewDistributionOffsets(0);
 	
 	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);
 	
 	updateCounter = 0;

 //	printf("updating distributions at time %f diff %f offset %f tmpmap est %i\n", newEventTime, timeDifference, bayesianStruct.posterior.offset, tmpMap);
 	
 	//addnoise to the tempo distribution
 	//bayesianStruct.decaySpeedDistribution(timeDifference);
 	
-	if (timeDifference > 50){
+	if (timeDifference > 50 && updatingSpeedDistribution){
 		addGaussianNoiseToSpeedPosterior(timeDifference * 10.0 / 100.);
 	}
 
 	printPostOffset();