comparison index.cpp @ 468:4dbd7917bf9e api-inversion

YAY!

audioDB::index_query_loop is now disentangled.  Hardwired lsh_in_core to
true, and invented a new QID flag for !lsh_exact.  All tests continue to
pass.

The plans now:
- extract the audiodb_query_spec() function from inside audioDB::query,
  and move audioDB::query (and the timestamps function) to audioDB.cpp;
- write libtests/0036 and libtests/0037 in terms of audiodb_query_spec();
- rewrite all the other libtests in terms of audiodb_query_spec();
- delete audiodb_query() [ and maybe rename audiodb_query_spec(), I
  dunno];
- implement example bindings (probably to Lisp, because that's what I
  know best);
- see if anyone other than me can work out how the API works.  If not,
  provide documentation;
- revise API in the light of user feedback.

 }
 
 // return -1 on error
 // return 0: if index does not exist
 // return nqv: if index exists
-int audioDB::index_query_loop(adb_t *adb, adb_query_spec_t *spec, adb_qstate_internal_t *qstate) {
+int audiodb_index_query_loop(adb_t *adb, adb_query_spec_t *spec, adb_qstate_internal_t *qstate) {
   
   double *query = 0, *query_data = 0;
   adb_qpointers_internal_t qpointers = {0};
 
   adb_qcallback_t callback_data;

   bool normalized = (spec->params.distance == ADB_DISTANCE_EUCLIDEAN_NORMED);
   double radius = spec->refine.radius;
   bool use_absolute_threshold = spec->refine.flags & ADB_REFINE_ABSOLUTE_THRESHOLD;
   double absolute_threshold = spec->refine.absolute_threshold;
 
-  // Set the point-reporter callback based on the value of lsh_exact
-  if(lsh_exact) {
+  if(spec->qid.flags & ADB_QID_FLAG_ALLOW_FALSE_POSITIVES) {
+    add_point_func = &audiodb_index_add_point_approximate;  
+  } else {
     qstate->exact_evaluation_queue = new std::priority_queue<PointPair>;
     add_point_func = &audiodb_index_add_point_exact;
-  } else {
-    add_point_func = &audiodb_index_add_point_approximate;  
-  }
+  }
+
+  /* FIXME: this hardwired lsh_in_core is here to allow for a
+   * transition period while the need for the argument is worked
+   * through.  Hopefully it will disappear again eventually. */
+  bool lsh_in_core = true;
 
   if(!audiodb_index_init_query(adb, spec, qstate, lsh_in_core)) {
     return 0;
   }
 

 
   uint32_t Nq = (qpointers.nvectors > O2_MAXTRACKLEN ? O2_MAXTRACKLEN : qpointers.nvectors) - sequence_length + 1;
   std::vector<std::vector<float> > *vv = audiodb_index_initialize_shingles(Nq, adb->header->dim, sequence_length);
 
   // Construct shingles from query features  
-  for(uint32_t pointID = 0; pointID < Nq; pointID++) 
+  for(uint32_t pointID = 0; pointID < Nq; pointID++) {
     audiodb_index_make_shingle(vv, pointID, query, adb->header->dim, sequence_length);
+  }
   
   // Normalize query vectors
   int vcount = audiodb_index_norm_shingles(vv, qpointers.l2norm, qpointers.power, adb->header->dim, sequence_length, radius, normalized, use_absolute_threshold, absolute_threshold);
   if(vcount == -1) {
     audiodb_index_delete_shingles(vv);

   uint32_t numVecsAboveThreshold = vcount;
 
   // Nq contains number of inspected points in query file, 
   // numVecsAboveThreshold is number of points with power >= absolute_threshold
   double *qpp = qpointers.power; // Keep original qpPtr for possible exact evaluation
-  if(!(spec->qid.flags & ADB_QUERY_ID_FLAG_EXHAUSTIVE) && numVecsAboveThreshold) {
+  if(!(spec->qid.flags & ADB_QID_FLAG_EXHAUSTIVE) && numVecsAboveThreshold) {
     if((qstate->lsh->get_lshHeader()->flags & O2_SERIAL_FILEFORMAT2) || lsh_in_core) {
       qstate->lsh->retrieve_point((*vv)[0], spec->qid.sequence_start, add_point_func, &callback_data);
     } else {
       qstate->lsh->serial_retrieve_point(database, (*vv)[0], spec->qid.sequence_start, add_point_func, &callback_data);
     }

       }
     }
   }
   audiodb_index_delete_shingles(vv);
 
-  if(lsh_exact) {
-    // Perform exact distance computation on point pairs in
-    // exact_evaluation_queue
+  if(!(spec->qid.flags & ADB_QID_FLAG_ALLOW_FALSE_POSITIVES)) {
     audiodb_query_queue_loop(adb, spec, qstate, query, &qpointers);
   }
   
  // Clean up
   if(query_data)