comparison nearestaccumulator.h @ 610:e21a3db643af

MORE MEMORY SANITY

Move the logic tracking which points have been visited already
(including the std::set datastructure) into the indexed query codepaths,
rather than inside accumulators.  This has the effect of drastically
reducing the memory used in non-indexed queries, such that the working
set for a 500-file database with 100000 vectors total goes from 1.2GB to
slightly under 3MB.

All this and less code, too!

   NearestAccumulator();
   ~NearestAccumulator();
   void add_point(adb_result_t *r);
   adb_query_results_t *get_points();
 private:
-  std::set< adb_result_t, adb_result_triple_lt > *set;
   std::set< adb_result_t, adb_result_qpos_lt > *points;
 };
 
 template <class T> NearestAccumulator<T>::NearestAccumulator()
-  : set(0), points(0) {
-  set = new std::set< adb_result_t, adb_result_triple_lt >;
+  : points(0) {
   points = new std::set< adb_result_t, adb_result_qpos_lt >;
 }
 
 template <class T> NearestAccumulator<T>::~NearestAccumulator() {
-  if(set) {
-    delete set;
-  }
   if(points) {
     delete points;
   }
 }
 
 template <class T> void NearestAccumulator<T>::add_point(adb_result_t *r) {
   if(!isnan(r->dist)) {
-    if(set->find(*r) == set->end()) {
-      set->insert(*r);
-
-      std::set< adb_result_t, adb_result_qpos_lt >::iterator it;
-      it = points->find(*r);
-      if(it == points->end()) {
-        points->insert(*r);
-      } else if(T()(*(const adb_result_t *)r,(*it))) {
-        points->erase(it);
-        points->insert(*r);
-      }
+    std::set< adb_result_t, adb_result_qpos_lt >::iterator it;
+    it = points->find(*r);
+    if(it == points->end()) {
+      points->insert(*r);
+    } else if(T()(*(const adb_result_t *)r,(*it))) {
+      points->erase(it);
+      points->insert(*r);
     }
   }
 }
 
 template <class T> adb_query_results_t *NearestAccumulator<T>::get_points() {