Mercurial > hg > audiodb
comparison audioDB.h @ 232:c76cdcf096fd refactoring
Proof of Reporter concept: restore pointQuery and trackPointQuery
Only now it's "obvious" how they are the same and how they differ from
the basic loop:
* normalizedDistance is the only new feature added;
* all the rest is in reporter stuff...
* ... except that we have to turn on L2Norm, even if we don't use it.
Alter the tests to cope with this fact, l2norming the point- and
track-search databases.
author | mas01cr |
---|---|
date | Mon, 10 Dec 2007 20:01:43 +0000 |
parents | acafe033b962 |
children | 9c3396bab02e |
comparison
equal
deleted
inserted
replaced
231:a5d2fa43accf | 232:c76cdcf096fd |
---|---|
165 unsigned queryType; // point queries default | 165 unsigned queryType; // point queries default |
166 unsigned pointNN; // how many point NNs ? | 166 unsigned pointNN; // how many point NNs ? |
167 unsigned trackNN; // how many track NNs ? | 167 unsigned trackNN; // how many track NNs ? |
168 unsigned sequenceLength; | 168 unsigned sequenceLength; |
169 unsigned sequenceHop; | 169 unsigned sequenceHop; |
170 bool normalizedDistance; | |
170 unsigned queryPoint; | 171 unsigned queryPoint; |
171 unsigned usingQueryPoint; | 172 unsigned usingQueryPoint; |
172 unsigned usingTimes; | 173 unsigned usingTimes; |
173 unsigned usingPower; | 174 unsigned usingPower; |
174 unsigned isClient; | 175 unsigned isClient; |
274 queryType(O2_POINT_QUERY), \ | 275 queryType(O2_POINT_QUERY), \ |
275 pointNN(O2_DEFAULT_POINTNN), \ | 276 pointNN(O2_DEFAULT_POINTNN), \ |
276 trackNN(O2_DEFAULT_TRACKNN), \ | 277 trackNN(O2_DEFAULT_TRACKNN), \ |
277 sequenceLength(16), \ | 278 sequenceLength(16), \ |
278 sequenceHop(1), \ | 279 sequenceHop(1), \ |
280 normalizedDistance(true), \ | |
279 queryPoint(0), \ | 281 queryPoint(0), \ |
280 usingQueryPoint(0), \ | 282 usingQueryPoint(0), \ |
281 usingTimes(0), \ | 283 usingTimes(0), \ |
282 usingPower(0), \ | 284 usingPower(0), \ |
283 isClient(0), \ | 285 isClient(0), \ |