cannam@0
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
cannam@0
|
2
|
cannam@0
|
3 /*
|
cannam@0
|
4 Vamp feature extraction plugin using the MATCH audio alignment
|
cannam@0
|
5 algorithm.
|
cannam@0
|
6
|
cannam@0
|
7 Centre for Digital Music, Queen Mary, University of London.
|
cannam@0
|
8 This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
|
cannam@0
|
9
|
cannam@0
|
10 This program is free software; you can redistribute it and/or
|
cannam@0
|
11 modify it under the terms of the GNU General Public License as
|
cannam@0
|
12 published by the Free Software Foundation; either version 2 of the
|
cannam@0
|
13 License, or (at your option) any later version. See the file
|
cannam@0
|
14 COPYING included with this distribution for more information.
|
cannam@0
|
15 */
|
cannam@0
|
16
|
cannam@0
|
17 #include "Matcher.h"
|
cannam@0
|
18
|
cannam@0
|
19 #include <iostream>
|
cannam@0
|
20
|
cannam@4
|
21 #include <cstdlib>
|
Chris@16
|
22 #include <cassert>
|
cannam@4
|
23
|
Chris@72
|
24 using namespace std;
|
Chris@72
|
25
|
Chris@10
|
26 //#define DEBUG_MATCHER 1
|
Chris@10
|
27
|
Chris@143
|
28 Matcher::Matcher(Parameters parameters, DistanceMetric::Parameters dparams,
|
Chris@143
|
29 Matcher *p) :
|
Chris@43
|
30 m_params(parameters),
|
Chris@143
|
31 m_metric(dparams)
|
Chris@23
|
32 {
|
Chris@23
|
33 #ifdef DEBUG_MATCHER
|
Chris@143
|
34 cerr << "*** Matcher: hopTime = " << parameters.hopTime
|
Chris@140
|
35 << ", blockTime = " << parameters.blockTime
|
Chris@140
|
36 << ", maxRunCount = " << parameters.maxRunCount
|
Chris@140
|
37 << ", diagonalWeight = " << parameters.diagonalWeight << endl;
|
Chris@23
|
38 #endif
|
Chris@140
|
39
|
Chris@43
|
40 m_otherMatcher = p; // the first matcher will need this to be set later
|
Chris@43
|
41 m_firstPM = (!p);
|
Chris@43
|
42 m_frameCount = 0;
|
Chris@43
|
43 m_runCount = 0;
|
Chris@43
|
44 m_blockSize = 0;
|
cannam@0
|
45
|
Chris@43
|
46 m_blockSize = lrint(m_params.blockTime / m_params.hopTime);
|
Chris@15
|
47 #ifdef DEBUG_MATCHER
|
Chris@43
|
48 cerr << "Matcher: m_blockSize = " << m_blockSize << endl;
|
Chris@15
|
49 #endif
|
cannam@0
|
50
|
Chris@43
|
51 m_initialised = false;
|
Chris@23
|
52 }
|
cannam@0
|
53
|
cannam@0
|
54 Matcher::~Matcher()
|
cannam@0
|
55 {
|
Chris@10
|
56 #ifdef DEBUG_MATCHER
|
Chris@15
|
57 cerr << "Matcher(" << this << ")::~Matcher()" << endl;
|
Chris@10
|
58 #endif
|
cannam@0
|
59 }
|
cannam@0
|
60
|
cannam@0
|
61 void
|
cannam@0
|
62 Matcher::init()
|
cannam@0
|
63 {
|
Chris@43
|
64 if (m_initialised) return;
|
cannam@0
|
65
|
Chris@104
|
66 m_frames = vector<vector<double> >(m_blockSize);
|
cannam@0
|
67
|
Chris@43
|
68 m_distXSize = m_blockSize * 2;
|
Chris@45
|
69
|
Chris@41
|
70 size();
|
cannam@0
|
71
|
Chris@43
|
72 m_frameCount = 0;
|
Chris@43
|
73 m_runCount = 0;
|
Chris@38
|
74
|
Chris@43
|
75 m_initialised = true;
|
Chris@16
|
76 }
|
Chris@16
|
77
|
Chris@87
|
78 bool
|
Chris@87
|
79 Matcher::isInRange(int i, int j)
|
Chris@87
|
80 {
|
Chris@87
|
81 if (m_firstPM) {
|
Chris@87
|
82 return ((i >= 0) &&
|
Chris@87
|
83 (i < int(m_first.size())) &&
|
Chris@87
|
84 (j >= m_first[i]) &&
|
Chris@87
|
85 (j < int(m_first[i] + m_bestPathCost[i].size())));
|
Chris@87
|
86 } else {
|
Chris@87
|
87 return m_otherMatcher->isInRange(j, i);
|
Chris@87
|
88 }
|
Chris@87
|
89 }
|
Chris@87
|
90
|
Chris@87
|
91 bool
|
Chris@87
|
92 Matcher::isAvailable(int i, int j)
|
Chris@87
|
93 {
|
Chris@87
|
94 if (m_firstPM) {
|
Chris@87
|
95 if (isInRange(i, j)) {
|
Chris@87
|
96 return (m_bestPathCost[i][j - m_first[i]] >= 0);
|
Chris@87
|
97 } else {
|
Chris@87
|
98 return false;
|
Chris@87
|
99 }
|
Chris@87
|
100 } else {
|
Chris@87
|
101 return m_otherMatcher->isAvailable(j, i);
|
Chris@87
|
102 }
|
Chris@87
|
103 }
|
Chris@87
|
104
|
Chris@87
|
105 pair<int, int>
|
Chris@87
|
106 Matcher::getColRange(int i)
|
Chris@87
|
107 {
|
Chris@87
|
108 if (i < 0 || i >= int(m_first.size())) {
|
Chris@87
|
109 cerr << "ERROR: Matcher::getColRange(" << i << "): Index out of range"
|
Chris@87
|
110 << endl;
|
Chris@87
|
111 throw "Index out of range";
|
Chris@87
|
112 } else {
|
Chris@87
|
113 return pair<int, int>(m_first[i], m_last[i]);
|
Chris@87
|
114 }
|
Chris@87
|
115 }
|
Chris@87
|
116
|
Chris@87
|
117 pair<int, int>
|
Chris@87
|
118 Matcher::getRowRange(int i)
|
Chris@87
|
119 {
|
Chris@87
|
120 return m_otherMatcher->getColRange(i);
|
Chris@87
|
121 }
|
Chris@87
|
122
|
Chris@87
|
123 float
|
Chris@87
|
124 Matcher::getDistance(int i, int j)
|
Chris@87
|
125 {
|
Chris@87
|
126 if (m_firstPM) {
|
Chris@87
|
127 if (!isInRange(i, j)) {
|
Chris@87
|
128 cerr << "ERROR: Matcher::getDistance(" << i << ", " << j << "): "
|
Chris@87
|
129 << "Location is not in range" << endl;
|
Chris@87
|
130 throw "Distance not available";
|
Chris@87
|
131 }
|
Chris@87
|
132 float dist = m_distance[i][j - m_first[i]];
|
Chris@87
|
133 if (dist < 0) {
|
Chris@87
|
134 cerr << "ERROR: Matcher::getDistance(" << i << ", " << j << "): "
|
Chris@87
|
135 << "Location is in range, but distance ("
|
Chris@87
|
136 << dist << ") is invalid or has not been set" << endl;
|
Chris@87
|
137 throw "Distance not available";
|
Chris@87
|
138 }
|
Chris@87
|
139 return dist;
|
Chris@87
|
140 } else {
|
Chris@87
|
141 return m_otherMatcher->getDistance(j, i);
|
Chris@87
|
142 }
|
Chris@87
|
143 }
|
Chris@87
|
144
|
Chris@87
|
145 void
|
Chris@87
|
146 Matcher::setDistance(int i, int j, float distance)
|
Chris@87
|
147 {
|
Chris@87
|
148 if (m_firstPM) {
|
Chris@87
|
149 if (!isInRange(i, j)) {
|
Chris@87
|
150 cerr << "ERROR: Matcher::setDistance(" << i << ", " << j << ", "
|
Chris@87
|
151 << distance << "): Location is out of range" << endl;
|
Chris@87
|
152 throw "Indices out of range";
|
Chris@87
|
153 }
|
Chris@87
|
154 m_distance[i][j - m_first[i]] = distance;
|
Chris@87
|
155 } else {
|
Chris@87
|
156 m_otherMatcher->setDistance(j, i, distance);
|
Chris@87
|
157 }
|
Chris@87
|
158 }
|
Chris@87
|
159
|
Chris@87
|
160 double
|
Chris@135
|
161 Matcher::getNormalisedPathCost(int i, int j)
|
Chris@135
|
162 {
|
Chris@135
|
163 // normalised for path length. 1+ prevents division by zero here
|
Chris@135
|
164 return getPathCost(i, j) / (1 + i + j);
|
Chris@135
|
165 }
|
Chris@135
|
166
|
Chris@135
|
167 double
|
Chris@87
|
168 Matcher::getPathCost(int i, int j)
|
Chris@87
|
169 {
|
Chris@87
|
170 if (m_firstPM) {
|
Chris@87
|
171 if (!isAvailable(i, j)) {
|
Chris@87
|
172 if (!isInRange(i, j)) {
|
Chris@87
|
173 cerr << "ERROR: Matcher::getPathCost(" << i << ", " << j << "): "
|
Chris@87
|
174 << "Location is not in range" << endl;
|
Chris@87
|
175 } else {
|
Chris@87
|
176 cerr << "ERROR: Matcher::getPathCost(" << i << ", " << j << "): "
|
Chris@87
|
177 << "Location is in range, but pathCost ("
|
Chris@87
|
178 << m_bestPathCost[i][j - m_first[i]]
|
Chris@87
|
179 << ") is invalid or has not been set" << endl;
|
Chris@87
|
180 }
|
Chris@87
|
181 throw "Path cost not available";
|
Chris@87
|
182 }
|
Chris@87
|
183 return m_bestPathCost[i][j - m_first[i]];
|
Chris@87
|
184 } else {
|
Chris@87
|
185 return m_otherMatcher->getPathCost(j, i);
|
Chris@87
|
186 }
|
Chris@87
|
187 }
|
Chris@87
|
188
|
Chris@87
|
189 void
|
Chris@87
|
190 Matcher::setPathCost(int i, int j, Advance dir, double pathCost)
|
Chris@87
|
191 {
|
Chris@87
|
192 if (m_firstPM) {
|
Chris@87
|
193 if (!isInRange(i, j)) {
|
Chris@87
|
194 cerr << "ERROR: Matcher::setPathCost(" << i << ", " << j << ", "
|
Chris@87
|
195 << dir << ", " << pathCost
|
Chris@87
|
196 << "): Location is out of range" << endl;
|
Chris@87
|
197 throw "Indices out of range";
|
Chris@87
|
198 }
|
Chris@87
|
199 m_advance[i][j - m_first[i]] = dir;
|
Chris@87
|
200 m_bestPathCost[i][j - m_first[i]] = pathCost;
|
Chris@87
|
201 } else {
|
Chris@87
|
202 if (dir == AdvanceThis) {
|
Chris@87
|
203 dir = AdvanceOther;
|
Chris@87
|
204 } else if (dir == AdvanceOther) {
|
Chris@87
|
205 dir = AdvanceThis;
|
Chris@87
|
206 }
|
Chris@87
|
207 m_otherMatcher->setPathCost(j, i, dir, pathCost);
|
Chris@87
|
208 }
|
Chris@87
|
209
|
Chris@87
|
210 }
|
Chris@87
|
211
|
cannam@0
|
212 void
|
Chris@41
|
213 Matcher::size()
|
cannam@0
|
214 {
|
Chris@43
|
215 int distSize = (m_params.maxRunCount + 1) * m_blockSize;
|
Chris@71
|
216 m_bestPathCost.resize(m_distXSize, vector<double>(distSize, -1));
|
Chris@71
|
217 m_distance.resize(m_distXSize, vector<float>(distSize, -1));
|
Chris@45
|
218 m_advance.resize(m_distXSize, vector<Advance>(distSize, AdvanceNone));
|
Chris@43
|
219 m_first.resize(m_distXSize, 0);
|
Chris@43
|
220 m_last.resize(m_distXSize, 0);
|
Chris@38
|
221 }
|
cannam@0
|
222
|
Chris@23
|
223 void
|
Chris@72
|
224 Matcher::consumeFeatureVector(vector<double> feature)
|
Chris@23
|
225 {
|
Chris@43
|
226 if (!m_initialised) init();
|
Chris@43
|
227 int frameIndex = m_frameCount % m_blockSize;
|
Chris@43
|
228 m_frames[frameIndex] = feature;
|
Chris@23
|
229 calcAdvance();
|
Chris@21
|
230 }
|
Chris@21
|
231
|
Chris@21
|
232 void
|
Chris@21
|
233 Matcher::calcAdvance()
|
Chris@21
|
234 {
|
Chris@43
|
235 int frameIndex = m_frameCount % m_blockSize;
|
Chris@21
|
236
|
Chris@43
|
237 if (m_frameCount >= m_distXSize) {
|
Chris@43
|
238 m_distXSize *= 2;
|
Chris@41
|
239 size();
|
cannam@0
|
240 }
|
cannam@0
|
241
|
Chris@43
|
242 if (m_firstPM && (m_frameCount >= m_blockSize)) {
|
cannam@0
|
243
|
Chris@43
|
244 int len = m_last[m_frameCount - m_blockSize] -
|
Chris@43
|
245 m_first[m_frameCount - m_blockSize];
|
cannam@0
|
246
|
Chris@43
|
247 // We need to copy distance[m_frameCount-m_blockSize] to
|
Chris@43
|
248 // distance[m_frameCount], and then truncate
|
Chris@43
|
249 // distance[m_frameCount-m_blockSize] to its first len elements.
|
cannam@0
|
250 // Same for bestPathCost.
|
cannam@0
|
251
|
Chris@69
|
252 vector<float> dOld = m_distance[m_frameCount - m_blockSize];
|
Chris@71
|
253 vector<float> dNew(len, -1.f);
|
cannam@0
|
254
|
Chris@69
|
255 vector<double> bpcOld = m_bestPathCost[m_frameCount - m_blockSize];
|
Chris@71
|
256 vector<double> bpcNew(len, -1.0);
|
Chris@69
|
257
|
Chris@69
|
258 vector<Advance> adOld = m_advance[m_frameCount - m_blockSize];
|
Chris@69
|
259 vector<Advance> adNew(len, AdvanceNone);
|
Chris@69
|
260
|
Chris@69
|
261 for (int i = 0; i < len; ++i) {
|
Chris@69
|
262 dNew[i] = dOld[i];
|
Chris@69
|
263 bpcNew[i] = bpcOld[i];
|
Chris@69
|
264 adNew[i] = adOld[i];
|
Chris@69
|
265 }
|
Chris@45
|
266
|
Chris@69
|
267 m_distance[m_frameCount] = dOld;
|
Chris@69
|
268 m_distance[m_frameCount - m_blockSize] = dNew;
|
Chris@69
|
269
|
Chris@69
|
270 m_bestPathCost[m_frameCount] = bpcOld;
|
Chris@69
|
271 m_bestPathCost[m_frameCount - m_blockSize] = bpcNew;
|
Chris@69
|
272
|
Chris@69
|
273 m_advance[m_frameCount] = adOld;
|
Chris@69
|
274 m_advance[m_frameCount - m_blockSize] = adNew;
|
cannam@0
|
275 }
|
cannam@0
|
276
|
Chris@43
|
277 int stop = m_otherMatcher->m_frameCount;
|
Chris@43
|
278 int index = stop - m_blockSize;
|
Chris@86
|
279 if (index < 0) index = 0;
|
Chris@86
|
280
|
Chris@43
|
281 m_first[m_frameCount] = index;
|
Chris@43
|
282 m_last[m_frameCount] = stop;
|
cannam@0
|
283
|
cannam@0
|
284 for ( ; index < stop; index++) {
|
Chris@26
|
285
|
Chris@86
|
286 float distance = (float) m_metric.calcDistance
|
Chris@43
|
287 (m_frames[frameIndex],
|
Chris@45
|
288 m_otherMatcher->m_frames[index % m_blockSize]);
|
Chris@26
|
289
|
Chris@89
|
290 float diagDistance = distance * m_params.diagonalWeight;
|
Chris@89
|
291
|
Chris@86
|
292 if ((m_frameCount == 0) && (index == 0)) { // first element
|
Chris@86
|
293
|
Chris@86
|
294 updateValue(0, 0, AdvanceNone,
|
Chris@86
|
295 0,
|
Chris@86
|
296 distance);
|
Chris@86
|
297
|
Chris@86
|
298 } else if (m_frameCount == 0) { // first row
|
Chris@86
|
299
|
Chris@71
|
300 updateValue(0, index, AdvanceOther,
|
Chris@86
|
301 getPathCost(0, index-1),
|
Chris@86
|
302 distance);
|
Chris@86
|
303
|
Chris@86
|
304 } else if (index == 0) { // first column
|
Chris@86
|
305
|
Chris@71
|
306 updateValue(m_frameCount, index, AdvanceThis,
|
Chris@86
|
307 getPathCost(m_frameCount - 1, 0),
|
Chris@86
|
308 distance);
|
Chris@86
|
309
|
Chris@86
|
310 } else if (index == m_otherMatcher->m_frameCount - m_blockSize) {
|
Chris@86
|
311
|
cannam@0
|
312 // missing value(s) due to cutoff
|
cannam@0
|
313 // - no previous value in current row (resp. column)
|
cannam@0
|
314 // - no diagonal value if prev. dir. == curr. dirn
|
Chris@86
|
315
|
Chris@72
|
316 double min2 = getPathCost(m_frameCount - 1, index);
|
Chris@86
|
317
|
Chris@91
|
318 // cerr << "NOTE: missing value at i = " << m_frameCount << ", j = "
|
Chris@91
|
319 // << index << " (first = " << m_firstPM << ")" << endl;
|
Chris@86
|
320
|
Chris@43
|
321 // if ((m_firstPM && (first[m_frameCount - 1] == index)) ||
|
Chris@43
|
322 // (!m_firstPM && (m_last[index-1] < m_frameCount)))
|
Chris@86
|
323 if (m_first[m_frameCount - 1] == index) {
|
Chris@86
|
324
|
Chris@86
|
325 updateValue(m_frameCount, index, AdvanceThis,
|
Chris@86
|
326 min2, distance);
|
Chris@86
|
327
|
Chris@86
|
328 } else {
|
Chris@86
|
329
|
Chris@72
|
330 double min1 = getPathCost(m_frameCount - 1, index - 1);
|
Chris@89
|
331 if (min1 + diagDistance <= min2 + distance) {
|
Chris@86
|
332 updateValue(m_frameCount, index, AdvanceBoth,
|
Chris@86
|
333 min1, distance);
|
Chris@86
|
334 } else {
|
Chris@86
|
335 updateValue(m_frameCount, index, AdvanceThis,
|
Chris@86
|
336 min2, distance);
|
Chris@86
|
337 }
|
cannam@0
|
338 }
|
Chris@86
|
339
|
cannam@0
|
340 } else {
|
Chris@86
|
341
|
Chris@86
|
342 double min1 = getPathCost(m_frameCount, index - 1);
|
Chris@72
|
343 double min2 = getPathCost(m_frameCount - 1, index);
|
Chris@86
|
344 double min3 = getPathCost(m_frameCount - 1, index - 1);
|
Chris@87
|
345
|
Chris@89
|
346 double cost1 = min1 + distance;
|
Chris@89
|
347 double cost2 = min2 + distance;
|
Chris@89
|
348 double cost3 = min3 + diagDistance;
|
Chris@93
|
349
|
Chris@93
|
350 // Choosing is easy if there is a strict cheapest of the
|
Chris@93
|
351 // three. If two or more share the lowest cost, we choose
|
Chris@93
|
352 // in order of preference: cost3 (AdvanceBoth), cost2
|
Chris@94
|
353 // (AdvanceThis), cost1 (AdvanceOther) if we are the first
|
Chris@94
|
354 // matcher; and cost3 (AdvanceBoth), cost1 (AdvanceOther),
|
Chris@94
|
355 // cost2 (AdvanceThis) if we are the second matcher. That
|
Chris@94
|
356 // is, we always prioritise the diagonal followed by the
|
Chris@94
|
357 // first matcher.
|
Chris@94
|
358
|
Chris@94
|
359 if (( m_firstPM && (cost1 < cost2)) ||
|
Chris@94
|
360 (!m_firstPM && (cost1 <= cost2))) {
|
Chris@89
|
361 if (cost3 <= cost1) {
|
Chris@86
|
362 updateValue(m_frameCount, index, AdvanceBoth,
|
Chris@86
|
363 min3, distance);
|
Chris@86
|
364 } else {
|
Chris@86
|
365 updateValue(m_frameCount, index, AdvanceOther,
|
Chris@86
|
366 min1, distance);
|
Chris@86
|
367 }
|
cannam@0
|
368 } else {
|
Chris@89
|
369 if (cost3 <= cost2) {
|
Chris@86
|
370 updateValue(m_frameCount, index, AdvanceBoth,
|
Chris@86
|
371 min3, distance);
|
Chris@86
|
372 } else {
|
Chris@86
|
373 updateValue(m_frameCount, index, AdvanceThis,
|
Chris@86
|
374 min2, distance);
|
Chris@86
|
375 }
|
cannam@0
|
376 }
|
cannam@0
|
377 }
|
Chris@86
|
378
|
Chris@43
|
379 m_otherMatcher->m_last[index]++;
|
cannam@0
|
380 } // loop for row (resp. column)
|
cannam@0
|
381
|
Chris@43
|
382 m_frameCount++;
|
Chris@43
|
383 m_runCount++;
|
cannam@0
|
384
|
Chris@43
|
385 m_otherMatcher->m_runCount = 0;
|
Chris@21
|
386 }
|
cannam@0
|
387
|
cannam@0
|
388 void
|
Chris@96
|
389 Matcher::updateValue(int i, int j, Advance dir, double value, float distance)
|
cannam@0
|
390 {
|
Chris@96
|
391 float weighted = distance;
|
Chris@83
|
392 if (dir == AdvanceBoth) {
|
Chris@83
|
393 weighted *= m_params.diagonalWeight;
|
Chris@83
|
394 }
|
Chris@83
|
395
|
Chris@43
|
396 if (m_firstPM) {
|
Chris@45
|
397
|
Chris@96
|
398 setDistance(i, j, distance);
|
Chris@83
|
399 setPathCost(i, j, dir, value + weighted);
|
Chris@45
|
400
|
cannam@0
|
401 } else {
|
Chris@45
|
402
|
Chris@86
|
403 if (dir == AdvanceThis) dir = AdvanceOther;
|
Chris@86
|
404 else if (dir == AdvanceOther) dir = AdvanceThis;
|
Chris@84
|
405
|
Chris@43
|
406 int idx = i - m_otherMatcher->m_first[j];
|
Chris@45
|
407
|
Chris@69
|
408 if (idx == (int)m_otherMatcher->m_distance[j].size()) {
|
cannam@0
|
409 // This should never happen, but if we allow arbitrary
|
cannam@0
|
410 // pauses in either direction, and arbitrary lengths at
|
cannam@0
|
411 // end, it is better than a segmentation fault.
|
Chris@72
|
412 cerr << "Emergency resize: " << idx << " -> " << idx * 2 << endl;
|
Chris@71
|
413 m_otherMatcher->m_bestPathCost[j].resize(idx * 2, -1);
|
Chris@71
|
414 m_otherMatcher->m_distance[j].resize(idx * 2, -1);
|
Chris@46
|
415 m_otherMatcher->m_advance[j].resize(idx * 2, AdvanceNone);
|
cannam@0
|
416 }
|
Chris@45
|
417
|
Chris@96
|
418 m_otherMatcher->setDistance(j, i, distance);
|
Chris@83
|
419 m_otherMatcher->setPathCost(j, i, dir, value + weighted);
|
cannam@0
|
420 }
|
Chris@71
|
421 }
|
cannam@0
|
422
|
Chris@72
|
423 Matcher::Advance
|
Chris@72
|
424 Matcher::getAdvance(int i, int j)
|
Chris@72
|
425 {
|
Chris@72
|
426 if (m_firstPM) {
|
Chris@72
|
427 if (!isInRange(i, j)) {
|
Chris@72
|
428 cerr << "ERROR: Matcher::getAdvance(" << i << ", " << j << "): "
|
Chris@72
|
429 << "Location is not in range" << endl;
|
Chris@72
|
430 throw "Advance not available";
|
Chris@72
|
431 }
|
Chris@72
|
432 return m_advance[i][j - m_first[i]];
|
Chris@72
|
433 } else {
|
Chris@72
|
434 return m_otherMatcher->getAdvance(j, i);
|
Chris@72
|
435 }
|
Chris@72
|
436 }
|