Mercurial > hg > audio-time-warp
diff src/timeWarp.h @ 1:6842ff391568
getting rid of pointer use in processAudio - not many changes
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 18 May 2011 16:47:12 +0100 |
| parents | 572c856e38ac |
| children | f40577e6b30d |
line wrap: on
line diff
--- a/src/timeWarp.h Tue May 17 08:48:58 2011 +0100 +++ b/src/timeWarp.h Wed May 18 16:47:12 2011 +0100 @@ -74,9 +74,17 @@ // void drawSimilarityMatrix(); // void printSimilarityMatrix(int sizeToPrint); - DoubleMatrix alignmentMeasureMatrix; + Chromagram chromoGramm; + Chromagram secondChromoGramm; + + + DoubleMatrix alignmentMeasureMatrix;//just the choma alignment DoubleVector minimumAlignmentPath; + //new addition + DoubleMatrix superAlignmentMeasureMatrix; //for the onset + chromagram alignment + DoubleVector superMinimumAlignmentPath; + // void drawAlignmentPath(int startingChromaXFrame, int startingChromaYFrame); int findStartWidthFrame(); @@ -99,7 +107,7 @@ void calculateAlignmentMatrix(); double getDistance(int i, int j); - void printAlignmentMatrix(); +// void printAlignmentMatrix(); double getMinimum(int i, int j, float newValue); bool extendAlignmentUp(); bool extendAlignmentAlong(); @@ -115,8 +123,6 @@ - Chromagram chromoGramm; - Chromagram secondChromoGramm;