comparison query-indexed.cpp @ 589:9119f2fa3efe

Header file rearrangement

Make it so that lshlib.h is slightly more like a header file to include
to use the LSH ("class G") class, and slightly less a header file for
developing that class, by removing all the #includes and moving them to
the one-file lshlib.cpp instead.

Make audioDB-internals.h slightly more of a project header file, by
including there all the headers we actually need.

Remove some assert()s (which do nothing) and some Uns32Ts (-> uint32_t)

 extern "C" {
 #include "audioDB_API.h"
 }
 #include "audioDB-internals.h"
+#include "lshlib.h"
 
 /*
  * Routines and datastructures which are specific to indexed queries.
  */
 typedef struct adb_qcallback {

 
   delete[] indexName;
   return true;
 }
 
-void audiodb_index_add_point_approximate(void *user_data, Uns32T pointID, Uns32T qpos, float dist) {
+void audiodb_index_add_point_approximate(void *user_data, uint32_t pointID, uint32_t 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 trackID = audiodb_index_to_track_id(adb, pointID);
   uint32_t spos = audiodb_index_to_track_pos(adb, trackID, pointID);

   }
 }
 
 // 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) {
+void audiodb_index_add_point_exact(void *user_data, uint32_t pointID, uint32_t 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 trackID = audiodb_index_to_track_id(adb, pointID);
   uint32_t spos = audiodb_index_to_track_pos(adb, trackID, pointID);