diff dbaccumulator.h @ 498:342822c2d49a

Merge api-inversion branch (-r656:771, but I don't expect to return to
that branch) into the trunk.

I expect there to be minor performance regressions (e.g. in the SOAP
server index cacheing, which I have forcibly removed) and minor
unplugged memory leaks (e.g. in audioDB::query(), where I don't free up
the datum).  I hope that these leaks and performance regressions can be
plugged in short order.  I also expect that some (but maybe not all) of
the issues currently addressed in the memory-leaks branch are superseded
or fixed by this merge.

There remains much work to be done; go forth and do it.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dbaccumulator.h	Sat Jan 10 16:47:57 2009 +0000
@@ -0,0 +1,52 @@
+template <class T> class DBAccumulator : public Accumulator {
+public:
+  DBAccumulator(unsigned int pointNN);
+  ~DBAccumulator();
+  void add_point(adb_result_t *r);
+  adb_query_results_t *get_points();
+private:
+  unsigned int pointNN;
+  std::priority_queue< adb_result_t, std::vector<adb_result_t>, T > *queue;
+  std::set< adb_result_t, adb_result_triple_lt > *set;
+};
+
+template <class T> DBAccumulator<T>::DBAccumulator(unsigned int pointNN)
+  : pointNN(pointNN), queue(0), set(0) {
+  queue = new std::priority_queue< adb_result_t, std::vector<adb_result_t>, T>;
+  set = new std::set<adb_result_t, adb_result_triple_lt>;
+}
+
+template <class T> DBAccumulator<T>::~DBAccumulator() {
+  if(queue) {
+    delete queue;
+  }
+  if(set) {
+    delete set;
+  }
+}
+
+template <class T> void DBAccumulator<T>::add_point(adb_result_t *r) {
+  if(!isnan(r->dist)) {
+    if(set->find(*r) == set->end()) {
+      set->insert(*r);
+      queue->push(*r);
+      if(queue->size() > pointNN) {
+        queue->pop();
+      }
+    }
+  }
+}
+
+template <class T> adb_query_results_t *DBAccumulator<T>::get_points() {
+  unsigned int size = queue->size();
+  adb_query_results_t *r = (adb_query_results_t *) malloc(sizeof(adb_query_results_t));
+  adb_result_t *rs = (adb_result_t *) calloc(size, sizeof(adb_result_t));
+  r->nresults = size;
+  r->results = rs;
+
+  for(unsigned int k = 0; k < size; k++) {
+    rs[k] = queue->top();
+    queue->pop();
+  }
+  return r;
+}