comparison index.cpp @ 437:9a065b8db769 api-inversion

Hey, who let audioDB::set_up_query into the room?

audioDB::set_up_query and audioDB::set_up_db both do all sorts of
horrible pointer manipulation.  Define a structure to contain all the
pointers, rather than having the hideous argument lists full of double
**, and use it in audioDB::set_up_query and
audioDB::set_up_query_from_key.  (Those two functions are desperately
close to becoming one function, incidentally, or possibly even no
functions given the existence of adb_datum_t...)

 
 // return 0: if index does not exist
 // return nqv: if index exists
 int audioDB::index_query_loop(adb_query_spec_t *spec, 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;
+  adb_qpointers_internal_t qpointers = {0};
+
   void (*add_point_func)(void*,Uns32T,Uns32T,float);
 
   sequenceLength = spec->qid.sequence_length;
   normalizedDistance = (spec->params.distance == ADB_DISTANCE_EUCLIDEAN_NORMED);
 

     return 0;
 
   char* database = index_get_name(dbName, radius, sequenceLength);
 
   if(query_from_key)
-    set_up_query_from_key(spec, &query_data, &query, &qNorm, &qnPtr, &qPower, &qpPtr, &meanQdur, &numVectors, queryIndex);
+    set_up_query_from_key(spec, &query_data, &query, &qpointers, queryIndex);
   else
-    set_up_query(spec, &query_data, &query, &qNorm, &qnPtr, &qPower, &qpPtr, &meanQdur, &numVectors); // get query vectors
+    set_up_query(spec, &query_data, &query, &qpointers);
 
   VERB_LOG(1, "retrieving tracks...");
   
   gettimeofday(&tv1, NULL);   
   // query vector index
-  Uns32T Nq = (numVectors>O2_MAXTRACKLEN?O2_MAXTRACKLEN:numVectors) - sequenceLength + 1;
+  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, qnPtr, qpPtr );
+  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
-  double* qpp = qpPtr; // Keep original qpPtr for possible exact evaluation
+  double* qpp = qpointers.power; // Keep original qpPtr for possible exact evaluation
   if(usingQueryPoint && numVecsAboveThreshold){
     if((lsh->get_lshHeader()->flags&O2_SERIAL_FILEFORMAT2) || lsh_in_core)
       lsh->retrieve_point((*vv)[0], queryPoint, add_point_func, (void*)this);
     else
       lsh->serial_retrieve_point(database, (*vv)[0], queryPoint, add_point_func, (void*)this);

         }
       }
 
   if(lsh_exact)
     // Perform exact distance computation on point pairs in exact_evaluation_queue
-    query_loop_points(spec, query, qnPtr, qpPtr, meanQdur, numVectors); 
+    query_loop_points(spec, query, &qpointers);
   
   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))

   close(lshfid);
     
  // Clean up
   if(query_data)
     delete[] query_data;
-  if(qNorm)
-    delete[] qNorm;
-  if(qPower)
-    delete[] qPower;
+  if(qpointers.l2norm_data)
+    delete[] qpointers.l2norm_data;
+  if(qpointers.power_data)
+    delete[] qpointers.power_data;
+  if(qpointers.mean_duration)
+    delete[] qpointers.mean_duration;
   if(database)
     delete[] database;
 
   return Nq;
 }