# HG changeset patch
# User mas01mc
# Date 1233168946 0
# Node ID 7ee6a2701d90d09ce7fb495c088330514103b5a8
# Parent  cbd5841e6b70c99da754bdf8eead577cb543e42a
Added more debugging information: report numPairs returned from LSH bucket retrieval (pre-distance computation), entry/exit from audiodb_query_spec_qpointers(...)

diff -r cbd5841e6b70 -r 7ee6a2701d90 Makefile
--- a/Makefile	Wed Jan 28 17:54:18 2009 +0000
+++ b/Makefile	Wed Jan 28 18:55:46 2009 +0000
@@ -17,7 +17,7 @@
 MINORVERSION=0
 LIBRARY=lib$(EXECUTABLE).so.$(SOVERSION).$(MINORVERSION)
 
-override CFLAGS+=-O3 -g -fPIC
+override CFLAGS+=-ggdb -g -fPIC
 
 # set to DUMP hashtables on QUERY load
 #override CFLAGS+=-DLSH_DUMP_CORE_TABLES
diff -r cbd5841e6b70 -r 7ee6a2701d90 query-indexed.cpp
--- a/query-indexed.cpp	Wed Jan 28 17:54:18 2009 +0000
+++ b/query-indexed.cpp	Wed Jan 28 18:55:46 2009 +0000
@@ -115,11 +115,21 @@
     return -1;
   }
 
+#ifdef _LSH_DEBUG_
+  cout << "spec_qpointers...";
+  cout.flush();
+#endif
+
   if(audiodb_query_spec_qpointers(adb, spec, &query_data, &query, &qpointers)) {
     delete [] database;
     return -1;
   }
 
+#ifdef _LSH_DEBUG_
+  cout << "done" << endl;
+  cout.flush();
+#endif
+
   uint32_t Nq = (qpointers.nvectors > ADB_LSH_MAXTRACKLEN ? ADB_LSH_MAXTRACKLEN : qpointers.nvectors) - sequence_length + 1;
   std::vector<std::vector<float> > *vv = audiodb_index_initialize_shingles(Nq, adb->header->dim, sequence_length);
 
diff -r cbd5841e6b70 -r 7ee6a2701d90 query.cpp
--- a/query.cpp	Wed Jan 28 17:54:18 2009 +0000
+++ b/query.cpp	Wed Jan 28 18:55:46 2009 +0000
@@ -449,6 +449,10 @@
   double *dbdata = 0, *dbdata_pointer;
   Uns32T currentTrack = 0x80000000; // KLUDGE: Initialize with a value outside of track index range
   Uns32T npairs = qstate->exact_evaluation_queue->size();
+#ifdef _LSH_DEBUG_
+  cout << "Num vector pairs to evaluate: " << npairs << "..." << endl;
+  cout.flush();
+#endif  
   while(npairs--) {
     PointPair pp = qstate->exact_evaluation_queue->top();
     if(currentTrack != pp.trackID) {