Mercurial > hg > match-vamp
comparison src/Matcher.h @ 211:6373d14deace
Clip cost when adding increment in direction comparison as well as when updating
author | Chris Cannam |
---|---|
date | Fri, 27 Feb 2015 14:10:50 +0000 |
parents | 010b91e44098 |
children | 175c8f044e7c |
comparison
equal
deleted
inserted
replaced
210:96dc6a59e1ed | 211:6373d14deace |
---|---|
276 */ | 276 */ |
277 void updateValue(int i, int j, advance_t dir, pathcost_t value, distance_t dMN); | 277 void updateValue(int i, int j, advance_t dir, pathcost_t value, distance_t dMN); |
278 | 278 |
279 void calcAdvance(); | 279 void calcAdvance(); |
280 | 280 |
281 /** | |
282 * Add the given distance increment to the given path cost, and | |
283 * return the result clipped (if necessary) at MaxPathCost. | |
284 */ | |
285 pathcost_t addToCost(pathcost_t cost, pathcost_t increment); | |
286 | |
281 /** Points to the other performance with which this one is being | 287 /** Points to the other performance with which this one is being |
282 * compared. The data for the distance metric and the dynamic | 288 * compared. (See <code>m_firstPM</code>) |
283 * time warping is shared between the two matchers. In the | |
284 * original version, only one of the two performance matchers | |
285 * contained the distance metric. (See <code>first</code>) | |
286 */ | 289 */ |
287 Matcher *m_otherMatcher; | 290 Matcher *m_otherMatcher; |
288 | 291 |
289 /** Indicates which performance is considered primary (the | 292 /** Indicates which performance is considered primary (the |
290 * score). This is the performance shown on the vertical axis, | 293 * score). This is the performance shown on the vertical axis, |