Mercurial > hg > audio-time-warp
diff src/timeWarp.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
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 07 Nov 2011 17:24:52 +0000 |
| parents | 0d51e93bfe74 |
| children | 9adcffbdc16d |
line wrap: on
line diff
--- a/src/timeWarp.h Fri Nov 04 23:23:13 2011 +0000 +++ b/src/timeWarp.h Mon Nov 07 17:24:52 2011 +0000 @@ -17,6 +17,8 @@ #include "sndfile.h" #include "ofxFileDialogOSX.h" +//11/2011 +//what is similarity and what chromaSimilarity? #define FRAMESIZE 512 #define ENERGY_LENGTH 80000 @@ -32,7 +34,7 @@ ~TimeWarp(); void initialiseVariables(); - + void clearVectors(); //variables typedef std::vector<double> DoubleVector; typedef std::vector<DoubleVector> DoubleMatrix; @@ -139,7 +141,7 @@ bool extendRestrictedAlignmentAlong(int endIndexX, DoubleMatrix* alignmentMatrix, DoubleMatrix* simMatrix); - void printBackwardsPath(int startIndex, int endIndex, IntMatrix* backPath); + void printBackwardsPath(int startIndex, int endIndex, const IntMatrix* backPath); void copyForwardsPathToBackwardsPath(); float diagonalPenalty;