Mercurial > hg > audiodb

diff audioDB.h @ 534:57e459f62788

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed LSH_N_POINT_BITS coding for LSH index. Now uses binay search via STL lower_bound to locate tracks and positions from global pointID searching over cumulative track lengths. MERGE of branches/multiprobeLSH -r 819:821 onto trunk. This is a non backward-compatible change; WARNING generated on attempt to use INDEXING with older audioDB databases. Only INDEXES are broken, not ADB instances.
author mas01mc
date Wed, 04 Feb 2009 10:45:57 +0000
parents cc2b97d020b1
children e18843dc0aea
line wrap: on
line diff
--- a/audioDB.h	Sat Jan 24 09:39:39 2009 +0000
+++ b/audioDB.h	Wed Feb 04 10:45:57 2009 +0000
@@ -92,7 +92,7 @@
 #define O2_MAXNN (1000000U)
 #define O2_MAXSEQLEN (8000U)            // maximum feature vectors in a sequence
 #define O2_MAXTRACKS (1000000U)           // maximum number of tracks
-#define O2_MAXTRACKLEN ADB_LSH_MAXTRACKLEN
+
 #define O2_MAXDOTPRODUCTMEMORY (sizeof(O2_REALTYPE)*O2_MAXSEQLEN*O2_MAXSEQLEN) // 512MB
 #define O2_SERIAL_MAX_TRACKBATCH (1000000)
 #define O2_LARGE_ADB_SIZE (O2_DEFAULT_DATASIZE+1) // datasize at which features are kept externally (in Mbytes)