comparison audioDB-internals.h @ 672:a35ca2d5f238

Extend results structure to include a key for the query.

Fill that key from the query datum, if given, defaulting to ""; patch up
bindings and tests.

This is so that (Instance x Instance) operations such as querying and
sampling can be supported.

   LSH *cached_lsh;
 };
 
 typedef struct {
   bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
-    return strcmp(r1.key, r2.key) < 0;
-  }
-} adb_result_key_lt;
+    return strcmp(r1.ikey, r2.ikey) < 0;
+  }
+} adb_result_ikey_lt;
 
 typedef struct {
   bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
     return r1.qpos < r2.qpos;
   }

 typedef struct {
   bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
     return ((r1.ipos < r2.ipos) ||
             ((r1.ipos == r2.ipos) && 
              ((r1.qpos < r2.qpos) ||
-              ((r1.qpos == r2.qpos) && (strcmp(r1.key, r2.key) < 0)))));
+              ((r1.qpos == r2.qpos) && (strcmp(r1.ikey, r2.ikey) < 0)))));
   }
 } adb_result_triple_lt;
 
 /* this struct is for maintaining per-query state.  We don't want to
  * store this stuff in the adb struct itself, because (a) it doesn't

   Accumulator *accumulator;
   std::set<std::string> *allowed_keys;
   std::priority_queue<PointPair> *exact_evaluation_queue;
   std::set< adb_result_t, adb_result_triple_lt > *set;
   LSH *lsh;
+  const char *qkey;
 } adb_qstate_internal_t;
 
 /* We could go gcc-specific here and use typeof() instead of passing
  * in an explicit type.  Answers on a postcard as to whether that's a
  * good plan or not. */