comparison index.cpp @ 431:8632cd387e24 api-inversion

Punishment gluttony.

Continue teasing out vague orthogonalities by beginning the task of
using an adb_query_parameters_t.  This does have the benefit of making
the distance calculation clearer, and we begin to see the shape of a
putative audiodb_query() emerging from the shrapnel of audioDB::query.
(Only the general shape; the detail is still a long, long way away).

   exact_evaluation_queue->push(p);
 }
 
 // return 0: if index does not exist
 // return nqv: if index exists
-int audioDB::index_query_loop(adb_query_refine_t *refine, const char* dbName, Uns32T queryIndex) {
+int audioDB::index_query_loop(adb_query_parameters_t *params, adb_query_refine_t *refine, const char* dbName, Uns32T queryIndex) {
   
   unsigned int numVectors = 0;
   double *query = 0, *query_data = 0;
   double *qNorm = 0, *qnPtr = 0, *qPower = 0, *qpPtr = 0;
   double meanQdur = 0;
   void (*add_point_func)(void*,Uns32T,Uns32T,float);
 
+  normalizedDistance = (params->distance == ADB_DISTANCE_EUCLIDEAN_NORMED);
+
   // Set the point-reporter callback based on the value of lsh_exact
   if(lsh_exact){
     initialize_exact_evalutation_queue();
     add_point_func = &index_add_point_exact;
   }

   else
     set_up_query(&query_data, &query, &qNorm, &qnPtr, &qPower, &qpPtr, &meanQdur, &numVectors); // get query vectors
 
   VERB_LOG(1, "retrieving tracks...");
   
-  assert(pointNN>0 && pointNN<=O2_MAXNN);
-  assert(trackNN>0 && trackNN<=O2_MAXNN);
-
   gettimeofday(&tv1, NULL);   
   // query vector index
   Uns32T Nq = (numVectors>O2_MAXTRACKLEN?O2_MAXTRACKLEN:numVectors) - sequenceLength + 1;
   vv = index_initialize_shingles(Nq); // allocate memory to copy query vectors to shingles
   VERB_LOG(1, "Nq=%d", Nq);

         }
       }
 
   if(lsh_exact)
     // Perform exact distance computation on point pairs in exact_evaluation_queue
-    query_loop_points(query, qnPtr, qpPtr, meanQdur, numVectors, refine); 
+    query_loop_points(query, qnPtr, qpPtr, meanQdur, numVectors, params, refine); 
   
   gettimeofday(&tv2,NULL);
   VERB_LOG(1,"elapsed time: %ld msec\n",
            (tv2.tv_sec*1000 + tv2.tv_usec/1000) - 
            (tv1.tv_sec*1000 + tv1.tv_usec/1000))