diff src/BayesianArrayStructure.h @ 9:75dcd1308658

looked at tempo process, likelihood function changed and improved. Now drawing using constrained vector function. Good working version.

--- a/src/BayesianArrayStructure.h	Fri Aug 19 19:45:46 2011 +0100
+++ b/src/BayesianArrayStructure.h	Tue Aug 23 11:20:44 2011 +0100
@@ -67,6 +67,7 @@
 	double bestEstimate;
 	void updateBestEstimate();
 	double lastBestEstimateUpdateTime;
+	double speedEstimate;
 	
 	double speedDecayWidth, speedDecayAmount;
 	void decaySpeedDistribution(double timeDifference);
@@ -77,11 +78,11 @@
 	void calculateNewPriorOffset(const double& timeDifference);
 	void setNewDistributionOffsets(const double& newOffset);
 	
-	void updateTempoDistribution(const double& speedRatio, const double& matchFactor);
+	void setLikelihoodToConstant();
+	void updateTempoLikelihood(const double& speedRatio, const double& matchFactor);
+	void updateTempoDistribution();
 	
-	void setFlatTempoLikelihood();
 	void calculateTempoUpdate();
-	void updateTempoLikelihood(const double& speedRatio, const double& matchFactor);
 	
 	void crossUpdateArrays(DynamicVector& position, DynamicVector& speed, double timeDifference);
 	void complexCrossUpdate(const double& timeDifferenceInPositionVectorUnits);