Mercurial > hg > audio-time-warp

diff src/timeWarp.h @ 9:9adcffbdc16d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed bug with switching and make sure alignIndex never goes to zero, added in limit to the joint matrix that gets created.
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Mon, 07 Nov 2011 18:08:43 +0000
parents 166bece5922c
children 69419f188284
line wrap: on
line diff
--- a/src/timeWarp.h	Mon Nov 07 17:24:52 2011 +0000
+++ b/src/timeWarp.h	Mon Nov 07 18:08:43 2011 +0000
@@ -89,7 +89,7 @@
 
 	void calculateJointSimilarityMatrix(DoubleVector* energyVectorOne, DoubleVector* energyVectorTwo, DoubleMatrix* chromaSimilarityMatrix, DoubleMatrix* simMatrix);
 	
-	void calculatePartJointSimilarityMatrix(DoubleVector* firstEnergyVector, DoubleVector* secondEnergyVector, DoubleMatrix* chromaSimMatrix, DoubleMatrix* simMatrix, int startX, int startY, int endX);
+	void calculatePartJointSimilarityMatrix(DoubleVector* firstEnergyVector, DoubleVector* secondEnergyVector, DoubleMatrix* chromaSimMatrix, DoubleMatrix* simMatrix, int startX, int startY, int endX, int endY);
 
 	
 	double getJointChromaAndEnergyDistance(DoubleVector* energyVectorOne, DoubleMatrix* firstChromaMatrix, DoubleVector* energyVectorTwo, DoubleMatrix* secondChromaMatrix, int energyIndexX, int energyIndexY, double energyProportion, double chromaProportion);