changeset 447:b75c1e826058 api-inversion

LESS VERBOSITY

Tracing the API as currently implemented will be a little bit of a pain;
there won't be any terribly easy way to get helpful diagnostics, and our
error codes aren't very helpful.  But it's clearly wrong to have a
verbosity flag lurking, so we have to zap the messages.

--- a/index.cpp	Wed Dec 24 10:56:45 2008 +0000
+++ b/index.cpp	Wed Dec 24 10:56:49 2008 +0000
@@ -603,19 +603,16 @@
     error("failed to set up qpointers");
   }
 
-  VERB_LOG(1, "retrieving tracks...");
-  
   // query vector index
   Uns32T Nq = (qpointers.nvectors>O2_MAXTRACKLEN?O2_MAXTRACKLEN:qpointers.nvectors) - sequenceLength + 1;
   vv = index_initialize_shingles(Nq); // allocate memory to copy query vectors to shingles
-  VERB_LOG(1, "Nq=%d", Nq);
+
   // Construct shingles from query features  
   for( Uns32T pointID = 0 ; pointID < Nq ; pointID++ ) 
     index_make_shingle(vv, pointID, query, dbH->dim, sequenceLength);
   
   // Normalize query vectors
   Uns32T numVecsAboveThreshold = index_norm_shingles( vv, qpointers.l2norm, qpointers.power );
-  VERB_LOG(1, "Nq'=%d\n", numVecsAboveThreshold);
 
   // Nq contains number of inspected points in query file, 
   // numVecsAboveThreshold is number of points with power >= absolute_threshold

--- a/query.cpp	Wed Dec 24 10:56:45 2008 +0000
+++ b/query.cpp	Wed Dec 24 10:56:49 2008 +0000
@@ -607,8 +607,6 @@
       error("failed to set up db");
     }
 
-  VERB_LOG(1, "matching points...");
-
   // We are guaranteed that the order of points is sorted by:
   // trackID, spos, qpos
   // so we can be relatively efficient in initialization of track data.
@@ -769,19 +767,10 @@
       error("failed to read data");
     if(wL <= trackTable[track]) {  // test for short sequences
       
-      VERB_LOG(7,"%u.%jd.%u | ", track, (intmax_t) trackIndexOffset, trackTable[track]);
-      
       audiodb_initialize_arrays(adb, spec, track, qpointers.nvectors, query, data_buffer, D, DD);
 
-      if(spec->refine.flags & ADB_REFINE_DURATION_RATIO) {
-        VERB_LOG(3,"meanQdur=%f meanDBdur=%f\n", qpointers.mean_duration[0], dbpointers.mean_duration[track]);
-      }
-
       if((!(spec->refine.flags & ADB_REFINE_DURATION_RATIO)) || 
          fabs(dbpointers.mean_duration[track]-qpointers.mean_duration[0]) < qpointers.mean_duration[0]*spec->refine.duration_ratio) {
-        if(spec->refine.flags & ADB_REFINE_DURATION_RATIO) {
-          VERB_LOG(3,"within duration tolerance.\n");
-        }
 
 	// Search for minimum distance by shingles (concatenated vectors)
 	for(j = 0; j <= qpointers.nvectors - wL; j += HOP_SIZE) {