comparison index.cpp @ 424:c6046dd80570 api-inversion

Accumulators everywhere!

Now all codepaths go through accumulators, and the reporter is only used
right at the very end.

   assert(instancePtr); // We need an instance for this callback
   audioDB* myself = (audioDB*) instancePtr; // Use explicit cast to recover "this" instance
   Uns32T trackID = index_to_trackID(pointID, myself->lsh_n_point_bits);
   Uns32T spos = index_to_trackPos(pointID, myself->lsh_n_point_bits);
   // Skip identity in query_from_key
-  if( !myself->query_from_key || (myself->query_from_key && ( trackID != myself->query_from_key_index )) )
-    myself->reporter->add_point(trackID, qpos, spos, dist);
+  if( !myself->query_from_key || (myself->query_from_key && ( trackID != myself->query_from_key_index )) ) {
+    adb_result_t r;
+    r.key = myself->fileTable + trackID * O2_FILETABLE_ENTRY_SIZE;
+    r.dist = dist;
+    r.qpos = qpos;
+    r.ipos = spos;
+    myself->accumulator->add_point(&r);
+  }
 }
 
 // *Static* exact NN point reporter callback method for lshlib
 // Maintain a queue of points to pass to query_points() for exact evaluation
 void audioDB::index_add_point_exact(void* instancePtr, Uns32T pointID, Uns32T qpos, float dist){