comparison src/testApp.h @ 8:166bece5922c

Version that works sequentially with chroma and onset energy, but doesn't use combined matrix, hence more efficient. playing switches okay, bug fixed on path calculation

 	void drawAlignmentmeasureValues(const int& startingYframe);
 		void drawChromoGram();
 
 		void loadFirstAudioFile();
 		void initialiseVariables();
-
+	
+		void clearVectors();
+	
 		void calculateSimilarityAndAlignment();
 	
 	typedef std::vector<double> DoubleVector;
 	typedef std::vector<DoubleVector> DoubleMatrix;
 	
 	typedef std::vector<int> IntVector;
 	typedef std::vector<IntVector> IntMatrix;
-	
-//	DoubleMatrix chromaMatrix;
-//	DoubleMatrix secondMatrix;
+
 	DoubleMatrix* matrixPtr;
 	
 	void drawDoubleMatrix(DoubleMatrix* dMatrix);//DoubleMatrix* dMatrix); WOULD BE NICE TO USE POINTER BUT NOT WORKING YET
 	void drawSpectralDifference(DoubleMatrix* dMatrix);
 	

 	bool testForNewAlignmentMinimum(double *previousMinimum, int i, int j);	
 	
 	void calculateAlignmentMatrix();
 //	void performNextAlignment();
 	double getDistance(int i, int j);
-	void printAlignmentMatrix();
+	void printAlignmentMatrix(const DoubleMatrix& alignmentMatrix);
 	double getMinimum(int i, int j, float newValue);
 	bool extendAlignmentUp();
 	bool extendAlignmentAlong();
 	void calculateMinimumAlignmentPath();
 	int findMinimumOfVector(DoubleVector *d);

 		float chromaConversionRatio;//not needed but could be useful
 		TimeWarp tw;
 		Chromagram chromaG;
 	OnsetDetectionFunction* onset;
 	
-	int conversionFactor;
+	float conversionFactor;
 };
 
 #endif