comparison query-indexed.cpp @ 529:e532666226bc multiprobeLSH

Fixed a problem with inserting into exact_evaluation_queue, duplicate pairs were being inserted when querying multiple hashtables. That is now fixed by adding a unique constraint using set<PointPair> inserts and testing. This should speed things up quite a bit (like, 10-fold with default num tables).

   uint32_t trackID = audiodb_index_to_track_id(pointID, nbits);
   uint32_t spos = audiodb_index_to_track_pos(pointID, nbits);
   std::set<std::string>::iterator keys_end = qstate->allowed_keys->end();
   if(qstate->allowed_keys->find((*adb->keys)[trackID]) != keys_end) {
     PointPair p(trackID, qpos, spos);
-    qstate->exact_evaluation_queue->push(p);
+    if(qstate->set->find(p)==qstate->set->end()){
+      qstate->set->insert(p);
+      qstate->exact_evaluation_queue->push(p);
+    }
   }
 }
 
 // return -1 on error
 // return 0: if index does not exist

 
   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>;
+    qstate->set = new std::set<PointPair, less<PointPair> >;
     add_point_func = &audiodb_index_add_point_exact;
   }
 
   /* FIXME: this hardwired lsh_in_core is here to allow for a
    * transition period while the need for the argument is worked