Mercurial > hg > match-vamp
diff src/Finder.h @ 82:3616d541d69e refactors
Error-checking code optional
author | Chris Cannam |
---|---|
date | Thu, 27 Nov 2014 10:14:07 +0000 |
parents | c603d77b00ac |
children | de7034e93dd0 |
line wrap: on
line diff
--- a/src/Finder.h Thu Nov 27 08:13:29 2014 +0000 +++ b/src/Finder.h Thu Nov 27 10:14:07 2014 +0000 @@ -39,7 +39,6 @@ void setDurations(int d1, int d2); Matcher::Advance getExpandDirection(int row, int col); - Matcher::Advance getExpandDirection(int row, int col, bool check); /** Calculates a rectangle of the path cost matrix so that the * minimum cost path between the bottom left and top right @@ -67,8 +66,9 @@ int retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy); protected: +#ifdef PERFORM_ERROR_CHECKS struct ErrorPosition { - enum Type { NoError = 0, CostError }; + enum Type { NoError = 0, CostError, NoAdvance }; ErrorPosition() : type(NoError) { } Type type; int r; @@ -80,7 +80,8 @@ double costShouldBe; }; ErrorPosition checkPathCostMatrix(); - +#endif + Matcher *m_m; int m_duration1; int m_duration2;