comparison src/BayesianArrayStructure.h @ 2:5581023e0de4

Added separate CannamMidiFileLoader class to handle the loading in.

  *
  *  Created by Andrew on 17/07/2011.
  *  Copyright 2011 QMUL. All rights reserved.
  *
  */
+#ifndef BAYESIAN_ARRAY_STRUCTURE
+#define BAYESIAN_ARRAY_STRUCTURE
+
 
 #include "ofMain.h"
 //#include "DynamicBayesianArray.h"
 #include "DynamicVector.h"
 

 	void drawTempoArrays();
 	
 	void resetSize(int length);
 	void resetArrays();
 	void simpleExample();
+	void setStartPlaying();
+	void zeroArrays();
 	
 	double screenWidth;
 	
 	void copyPriorToPosterior();
 //	DynamicBayesianArray bayesArray;
 	
 	double lastEventTime;
+	double likelihoodNoise;
+	double speedLikelihoodNoise;
 	
 	DynamicVector tmpPrior;
-	
+	DynamicVector tmpPosteriorForStorage;
 	DynamicVector prior;
 	DynamicVector posterior;
 	DynamicVector likelihood;
 	
 	DynamicVector relativeSpeedPrior;
 	DynamicVector relativeSpeedLikelihood;
 	DynamicVector relativeSpeedPosterior;
 	DynamicVector acceleration;
 	
+	double tmpBestEstimate;
+	void updateTmpBestEstimate(const double& timeDifference);
+	
+	int updateCounter;
+	
+	void setPositionDistributionScalar(double f);
+	
 	void resetSpeedToOne();
+	void addGaussianNoiseToSpeedPosterior(const double& std_dev);
+	void addTriangularNoiseToSpeedPosterior(const double& std_dev);
 	
 	double bestEstimate;
 	void updateBestEstimate();
-//	double lastBestEstimateUpdateTime;
+	double lastBestEstimateUpdateTime;
 	
 	double speedDecayWidth, speedDecayAmount;
 	void decaySpeedDistribution(double timeDifference);
 	
 	void resetSpeedSize(int length);

 	void updateTempoLikelihood(const double& speedRatio, const double& matchFactor);
 	
 	void crossUpdateArrays(DynamicVector& position, DynamicVector& speed, double timeDifference);
 	
 };
-
+#endif