# HG changeset patch # User mas01mc # Date 1219352534 0 # Node ID 64c844de82d0756b8ed15c1e0171c728c0e99287 # Parent 634959ef98f22af24c7c6170599babf3ae73b8b0 Fixed an indexing bug where rest of track was ignored after first shingle with power below threshold. Put default O2_LSH_POINT_BITS back to 14 (16384 points), can be altered at compile time with CFLAGS+=-DO2_LSH_POINT_BITS n diff -r 634959ef98f2 -r 64c844de82d0 audioDB.h --- a/audioDB.h Thu Aug 21 19:58:55 2008 +0000 +++ b/audioDB.h Thu Aug 21 21:02:14 2008 +0000 @@ -85,7 +85,7 @@ // Override the default point bit width for large database support #ifndef LSH_N_POINT_BITS -#define LSH_N_POINT_BITS 12 +#define LSH_N_POINT_BITS O2_DEFAULT_LSH_N_POINT_BITS #endif // LIMIT PARAMETERS diff -r 634959ef98f2 -r 64c844de82d0 index.cpp --- a/index.cpp Thu Aug 21 19:58:55 2008 +0000 +++ b/index.cpp Thu Aug 21 21:02:14 2008 +0000 @@ -382,10 +382,10 @@ Uns32T audioDB::index_insert_shingles(vector >* vv, Uns32T trackID, double* spp){ Uns32T collisionCount = 0; cout << "[" << trackID << "]" << fileTable+trackID*O2_FILETABLE_ENTRY_SIZE; - for( Uns32T pointID=0 ; pointID < (*vv).size(); pointID+=sequenceHop) - if(!use_absolute_threshold || (use_absolute_threshold && (*spp >= absolute_threshold))){ + for( Uns32T pointID=0 ; pointID < (*vv).size(); pointID+=sequenceHop){ + if(!use_absolute_threshold || (use_absolute_threshold && (*spp >= absolute_threshold))) collisionCount += lsh->insert_point((*vv)[pointID], index_from_trackInfo(trackID, pointID, lsh_n_point_bits)); - spp+=sequenceHop; + spp+=sequenceHop; } return collisionCount; }