comparison src/BayesianArrayStructure.cpp @ 22:9860abc92a30

follower has confidence measure now just using best match. Difficulty in visualising the speed likelihood fn

 #include "BayesianArrayStructure.h"
 
 BayesianArrayStructure::BayesianArrayStructure(){
 	printf("Bayesian structure: DeFault constructor called");
 	
+	relativeSpeedLikelihoodStdDev = 5.0;
+	
 	prior.createVector(1);
 	likelihood.createVector(1);
 	posterior.createVector(1);
-
+	tmpPrior.createVector(1);
+	
 	speedPriorValue = 1.0;
 	speedEstimate = speedPriorValue;
 	
 	lastEventTime = 0;//ofGetElapsedTimeMillis();
 
 	tmpBestEstimate = 0;
-	crossUpdateTimeThreshold = 100;
+	crossUpdateTimeThreshold = 60;
 	priorWidth = 50;
 }
 
 BayesianArrayStructure::BayesianArrayStructure(int length){
 	printf("BAYESIAN STURTUCRE CREATED LENGTH: %i\n", length);
 	//this constructor isnt called  it seems
 	prior.createVector(length);
 	likelihood.createVector(length);
 	posterior.createVector(length);
+	tmpPrior.createVector(length);
 	
 	lastEventTime = 0;
-	usingIntegratedTempoEstimate = false;//use max index
+	usingIntegratedTempoEstimate = true;//use max index
 
 }
 
 
 

 	printf("BAYESIAN STRUCTURE size is : %i\n", length);
 	
 	prior.createVector(length);
 	likelihood.createVector(length);
 	posterior.createVector(length);
-	
 	
 	acceleration.createVector(length);
 	
 }
 

 	posterior.zero();
 
 	posterior.addToIndex(0, 1);
 	posterior.renormalise();
 	
+
 	//acceleration.addGaussianShape(2000, 20, 0.8);
 	
 }
 
 void BayesianArrayStructure::setSpeedPrior(double f){	

 	
 	relativeSpeedPrior.createVector(length);
 	relativeSpeedLikelihood.createVector(length);
 	relativeSpeedPosterior.createVector(length);
 	tmpPosteriorForStorage.createVector(length);
+	
+	tmpPrior.createVector(length);
+	tmpPrior.zero();
+	tmpPrior.addConstant(0.1);
+	tmpPrior.addGaussianShape(130, 10, 0.2);
+	printf("TMP PRIOR TEST VECTOR\n");
+	tmpPrior.printArray();
 	
 
 }
 
 void BayesianArrayStructure::setRelativeSpeedScalar(double f){

 	//speedratio is speed of played relative to the recording
 	
 	double index = relativeSpeedLikelihood.getRealTermsAsIndex(speedRatio);
 	//	printf("index of likelihood would be %f for ratio %f\n", index, speedRatio);
 	if (index >= 0 && index < relativeSpeedPrior.length){	
-		relativeSpeedLikelihood.addGaussianShape(index , 5, matchFactor);
-	}
-}
-	
-	
+		relativeSpeedLikelihood.addGaussianShape(index , relativeSpeedLikelihoodStdDev, matchFactor);
+	}
+}
+	
+
+
 void BayesianArrayStructure::updateTempoDistribution(){
 
 	//copy posterior to prior
 	relativeSpeedPrior.copyFromDynamicVector(relativeSpeedPosterior);
 

 	likelihood.drawVector(0, displaySize);
 	ofSetColor(255,0,255);
 	posterior.drawVector(0, displaySize);
 	
 	
-//	ofSetColor(255,255,255);
-//	tmpPrior.drawVector(0,300);
 	
 }
 
 
 void BayesianArrayStructure::drawTempoArrays(){
 	ofSetColor(0,0,255);
 //	relativeSpeedPrior.drawVector(0, relativeSpeedPrior.arraySize);
 	
-	ofSetColor(255,0,255);
+	ofSetColor(0,150,255);
 	relativeSpeedLikelihood.drawVector(0, relativeSpeedLikelihood.arraySize);
+	
 //	relativeSpeedLikelihood.drawConstrainedVector(0, 199, 0, 1000);// relativeSpeedLikelihood.arraySize);	
 	ofSetColor(255,0,0);
 	relativeSpeedPosterior.drawVector(0, relativeSpeedPosterior.arraySize);
 	
 //	ofSetColor(0,0,255);
 //	tmpPosteriorForStorage.drawVector(0, tmpPosteriorForStorage.arraySize);
 	
 	ofSetColor(255,255, 255);
 	ofLine(screenWidth/2, 0, screenWidth/2, ofGetHeight());//middle of screen
 	
-	ofSetColor(155,255, 0);
+	ofSetColor(25, 0, 250);
 	double fractionOfScreen = ((double)relativeSpeedPosterior.integratedEstimate / relativeSpeedPosterior.length);
 	ofLine(screenWidth * fractionOfScreen, 0, screenWidth * fractionOfScreen, ofGetHeight());
 	
-	ofSetColor(0,255, 255);
+	ofSetColor(255, 0, 20);
 	fractionOfScreen = ((double)relativeSpeedPosterior.MAPestimate / relativeSpeedPosterior.length);
 	ofLine(screenWidth * fractionOfScreen, 0, screenWidth * fractionOfScreen, ofGetHeight());
+	 
 	
 }
 
 
 void BayesianArrayStructure::drawArraysRelativeToTimeframe(const double& startTimeMillis, const double& endTimeMillis){

 	string relativeString = " offset "+ofToString(prior.offset, 1);//starttimes("+ofToString(startTimeMillis)+", "+ofToString(endTimeMillis);
 	relativeString += ": index "+ofToString(startArrayIndex)+" , "+ofToString(endArrayIndex)+" [";
 //	relativeString += ofToString(prior.getIndexInRealTerms(endArrayIndex), 3)+"] (sc-width:"+ofToString(screenWidthMillis, 1)+")  ";
 	relativeString += " mapped to screen "+ofToString(startScreenPosition)+" , "+ofToString(endScreenPosition);
 //	ofDrawBitmapString(relativeString, 100, 180);
-		
-	ofSetColor(255, 255, 0);
+	
+		
+		
+	ofSetColor(100,100,100);//255, 255, 0);
 	likelihood.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
 
-	ofSetColor(0,0,200);
+//	ofSetColor(0,0,200);
+	ofSetColor(170,170,170);//00,200);
 	prior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
 		
-	ofSetColor(200, 0, 0);
+		ofSetColor(0,0,150);	
+//	ofSetColor(200, 0, 0);
 	posterior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
 		
 		
 //	ofSetColor(0, 200, 255);
 //	acceleration.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);