comparison index.cpp @ 463:35bb388d0eac api-inversion

audioDB::query_loop and audioDB::query_loop_points are no more.

Be a little bit careful about deleting the exact_evaluation_queue in
error conditions, but otherwise this was simple (If you ignore the work
of the previous $N$ commits, that is).  The inversion work in query.cpp
is now complete, apart from physically teasing apart the API function
from the body of audioDB::query and then moving the two remaining
audioDB:: methods elsewhere.  Unfortunately, we're still not quite done,
because we have to deal with audioDB::index_query_loop too, which is
still a little bit tangled.  Still, we're nearly there...

     r.ipos = spos;
     qstate->accumulator->add_point(&r);
   }
 }
 
-// Maintain a queue of points to pass to query_loop_points() for exact
-// evaluation
+// Maintain a queue of points to pass to audiodb_query_queue_loop()
+// for exact evaluation
 void audiodb_index_add_point_exact(void *user_data, Uns32T pointID, Uns32T qpos, float dist) {
   adb_qcallback_t *data = (adb_qcallback_t *) user_data;
   adb_t *adb = data->adb;
   adb_qstate_internal_t *qstate = data->qstate;
   uint32_t nbits = audiodb_lsh_n_point_bits(adb);

       }
   audiodb_index_delete_shingles(vv);
 
   if(lsh_exact)
     // Perform exact distance computation on point pairs in exact_evaluation_queue
-    query_loop_points(adb, spec, qstate, query, &qpointers);
+    audiodb_query_queue_loop(adb, spec, qstate, query, &qpointers);
   
   // Close the index file
   close(lshfid);
     
  // Clean up