comparison src/BayesianArrayStructure.cpp @ 14:3f103cf78148

Checking to allow offline version

 	posterior.createVector(1);
 
 	speedPriorValue = 1.0;
 	speedEstimate = speedPriorValue;
 	
-	lastEventTime = ofGetElapsedTimeMillis();
-	
+	lastEventTime = 0;//ofGetElapsedTimeMillis();
+
 	/*
 	 tmpPrior.createVector(240);
 	 tmpPrior.addGaussianShape(100, 40, 1);
 	 tmpPrior.addGaussianShape(200, 10, 0.2);
 	 tmpPrior.translateDistribution(20);
 	 */
 	tmpBestEstimate = 0;
 	crossUpdateTimeThreshold = 100;
+	priorWidth = 30;
 }
 
 BayesianArrayStructure::BayesianArrayStructure(int length){
 	printf("BAYESIAN STURTUCRE CREATED LENGTH: %i\n", length);
 	//this constructor isnt called  it seems

 
 void BayesianArrayStructure::setSpeedPrior(double f){	
 	speedPriorValue = f;
 	int index = relativeSpeedPosterior.getRealTermsAsIndex(speedPriorValue);
 	relativeSpeedPosterior.zero();
-	relativeSpeedPosterior.addGaussianShape(index, 20, 0.8);
+	relativeSpeedPosterior.addGaussianShape(index, priorWidth, 0.8);
 	relativeSpeedPosterior.renormalise();
 	relativeSpeedPosterior.getMaximum();
 	relativeSpeedPrior.copyFromDynamicVector(relativeSpeedPosterior);
 	printf("BAYES STRUCTU ' SPEED PRIOR %f . index %i\n", speedPriorValue, index);
 	

 }
 
 void BayesianArrayStructure::setStartPlaying(){
 	lastEventTime = 0;//ofGetElapsedTimeMillis();
 	bestEstimate = 0;
-	lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
-	
+	lastBestEstimateUpdateTime = lastEventTime;
+	//bug somewhere here that prevented offline
+	//ofGetElapsedTimeMillis();//lastEventTime;//
+	printf("start playing - best estimate %f\n", lastBestEstimateUpdateTime);
 	resetArrays();
 }
 
 void BayesianArrayStructure::resetArrays(){
 	//called when we start playing

 	likelihood.addConstant(1);
 	
 	updateCounter = 0;
 	
 	bestEstimate = 0;
-//	lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
+	lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
+	//cannot just be zero - offline bug
+	
+	printf("bayes reset arrays - best estimate %f\n", lastBestEstimateUpdateTime);
 	
 	setSpeedPrior(speedPriorValue);
 }
 
 void BayesianArrayStructure::zeroArrays(){

 	// 
 	//printf("tmp best %f and best %f time diff %f posterior MAP %f at speed %f\n", tmpBestEstimate, bestEstimate, timeDifference, posterior.getIndexInRealTerms(posterior.MAPestimate), relativeSpeedPosterior.getIndexInRealTerms(relativeSpeedPosterior.integratedEstimate));
 	//lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
 }
 	
-void BayesianArrayStructure::updateBestEstimate(){
+void BayesianArrayStructure::updateBestEstimate(const double& timeDifference){
 //	double timeDiff = ofGetElapsedTimeMillis() - lastEventTime;//
-	double timeDiff = ofGetElapsedTimeMillis() - lastBestEstimateUpdateTime;
+	
+	double timeDiff = timeDifference;
+	
+	//Using timedifferencfe here will make it go wrong. Is time since beginning of playing
+	
+	//if (*realTimeMode)
+		timeDiff = ofGetElapsedTimeMillis() - lastBestEstimateUpdateTime;
 	
 	double speedEstimate = relativeSpeedPosterior.getIntegratedEstimate();
 	speedEstimate = relativeSpeedPosterior.getIndexInRealTerms(speedEstimate);
 	//relativeSpeedPosterior.getIndexInRealTerms(relativeSpeedPosterior.MAPestimate)
 	bestEstimate = posterior.getIndexInRealTerms(posterior.MAPestimate) + timeDiff*speedEstimate;