changeset 416:6e6f4c1cc14d api-inversion

Initial implementation of accumulators for forthcoming audiodb_query().

Minimally tested using a temporary test harness; do not use as food.

As well as the necessary C++ magic, doodle in API header files aiming
vaguely for a sane API.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accumulator.h	Wed Dec 24 10:54:40 2008 +0000
@@ -0,0 +1,234 @@
+#include <string>
+#include <set>
+#include <queue>
+#include <map>
+#include <functional>
+#include "audioDB.h"
+extern "C" {
+#include "audioDB_API.h"
+}
+#include "audioDB-internals.h"
+
+#ifndef ACCUMULATOR_H
+#define ACCUMULATOR_H
+
+class Accumulator {
+public:
+  virtual ~Accumulator() {};
+  virtual void add_point(adb_result_t *r) = 0;
+  virtual adb_query_results_t *get_points() = 0;
+};
+
+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;
+}
+
+template <class T> class PerTrackAccumulator : public Accumulator {
+public:
+  PerTrackAccumulator(unsigned int pointNN, unsigned int trackNN);
+  ~PerTrackAccumulator();
+  void add_point(adb_result_t *r);
+  adb_query_results_t *get_points();
+private:
+  unsigned int pointNN;
+  unsigned int trackNN;
+  std::map<adb_result_t, std::priority_queue< adb_result_t, std::vector<adb_result_t>, T > *, adb_result_key_lt> *queues;
+  std::set< adb_result_t, adb_result_triple_lt > *set;
+};
+
+template <class T> PerTrackAccumulator<T>::PerTrackAccumulator(unsigned int pointNN, unsigned int trackNN)
+  : pointNN(pointNN), trackNN(trackNN), queues(0), set(0) {
+  queues = new std::map<adb_result_t, std::priority_queue< adb_result_t, std::vector<adb_result_t>, T > *, adb_result_key_lt>;
+  set = new std::set< adb_result_t, adb_result_triple_lt >;
+}
+
+template <class T> PerTrackAccumulator<T>::~PerTrackAccumulator() {
+  if(queues) {
+    typename std::map< adb_result_t, std::priority_queue< adb_result_t, std::vector< adb_result_t >, T > *, adb_result_key_lt>::iterator it;
+    for(it = queues->begin(); it != queues->end(); it++) {
+      delete (*it).second;
+    }
+    delete queues;
+  }
+  if(set) {
+    delete set;
+  }
+}
+
+template <class T> void PerTrackAccumulator<T>::add_point(adb_result_t *r) {
+  if(!isnan(r->dist)) {
+    if(set->find(*r) == set->end()) {
+      set->insert(*r);
+
+      typename std::map< adb_result_t, std::priority_queue< adb_result_t, std::vector< adb_result_t >, T > *, adb_result_key_lt>::iterator it;
+      std::priority_queue< adb_result_t, std::vector< adb_result_t >, T > *queue;
+      it = queues->find(*r);
+      if(it == queues->end()) {
+        queue = new std::priority_queue< adb_result_t, std::vector< adb_result_t >, T >;
+        (*queues)[*r] = queue;
+      } else {
+        queue = (*it).second;
+      }
+
+      queue->push(*r);
+      if(queue->size() > pointNN) {
+        queue->pop();
+      }
+    }
+  }
+}
+
+template <class T> adb_query_results_t *PerTrackAccumulator<T>::get_points() {
+  typename std::map< adb_result_t, std::vector< adb_result_t >, adb_result_key_lt> points;
+  typename std::priority_queue< adb_result_t, std::vector< adb_result_t >, T> queue;
+  typename std::map< adb_result_t, std::priority_queue< adb_result_t, std::vector< adb_result_t >, T > *, adb_result_key_lt>::iterator it;
+
+  unsigned int size = 0;
+  for(it = queues->begin(); it != queues->end(); it++) {
+    unsigned int n = ((*it).second)->size();
+    std::vector<adb_result_t> v;
+    adb_result_t r;
+    double dist = 0;
+    for(unsigned int k = 0; k < n; k++) {
+      r = ((*it).second)->top();
+      dist += r.dist;
+      v.push_back(r);
+      ((*it).second)->pop();
+    }
+    points[r] = v;
+    dist /= n;
+    size += n;
+    r.dist = dist;
+    /* I will burn in hell */
+    r.ipos = n;
+    queue.push(r);
+    if(queue.size() > trackNN) {
+      size -= queue.top().ipos;
+      queue.pop();
+    }
+  }
+
+  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;
+  
+  unsigned int k = 0;
+  while(queue.size() > 0) {
+    std::vector<adb_result_t> v = points[queue.top()];
+    queue.pop();
+    while(v.size() > 0) {
+      rs[k++] = v.back();
+      v.pop_back();
+    }
+  }
+  return r;
+}
+
+template <class T> class NearestAccumulator : public Accumulator {
+public:
+  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 = 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);
+      }
+    }
+  }
+}
+
+template <class T> adb_query_results_t *NearestAccumulator<T>::get_points() {
+  unsigned int nresults = points->size();
+  adb_query_results_t *r = (adb_query_results_t *) malloc(sizeof(adb_query_results_t));
+  adb_result_t *rs = (adb_result_t *) calloc(nresults, sizeof(adb_result_t));
+  r->nresults = nresults;
+  r->results = rs;
+  std::set< adb_result_t, adb_result_qpos_lt >::iterator it;
+  unsigned int k = 0;
+  for(it = points->begin(); it != points->end(); it++) {
+    rs[k++] = *it;
+  }
+  return r;
+}
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accumulator_test.cpp	Wed Dec 24 10:54:40 2008 +0000
@@ -0,0 +1,28 @@
+#include "accumulator.h"
+
+static NearestAccumulator<adb_result_dist_lt> *foo = new NearestAccumulator<adb_result_dist_lt>();
+
+int main() {
+  adb_result_t r;
+  r.key = "hello";
+  r.ipos = 0;
+  r.qpos = 0;
+  r.dist = 3;
+  foo->add_point(&r);
+  r.ipos = 1;
+  r.dist = 2;
+  foo->add_point(&r);
+  r.qpos = 1;
+  foo->add_point(&r);
+
+  adb_query_results_t *rs;
+  rs = foo->get_points();
+  for (unsigned int k = 0; k < rs->nresults; k++) {
+    r = rs->results[k];
+    printf("%s: %f %u %u\n", r.key, r.dist, r.qpos, r.ipos);
+  }
+  free(rs->results);
+  free(rs);
+  delete foo;
+  return 1;
+}

--- a/audioDB-internals.h	Wed Dec 24 10:54:36 2008 +0000
+++ b/audioDB-internals.h	Wed Dec 24 10:54:40 2008 +0000
@@ -15,6 +15,39 @@
   std::set<std::string> *keys;
 };
 
+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;
+
+typedef struct {
+  bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
+    return r1.qpos < r2.qpos;
+  }
+} adb_result_qpos_lt;
+
+typedef struct {
+  bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
+    return r1.dist < r2.dist;
+  }
+} adb_result_dist_lt;
+
+typedef struct {
+  bool operator() (const adb_result_t &r1, const adb_result_t &r2) {
+    return r1.dist > r2.dist;
+  }
+} adb_result_dist_gt;
+
+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)))));
+  }
+} adb_result_triple_lt;
+
 /* 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. */

--- a/audioDB_API.h	Wed Dec 24 10:54:36 2008 +0000
+++ b/audioDB_API.h	Wed Dec 24 10:54:40 2008 +0000
@@ -74,6 +74,40 @@
 };
 typedef struct adbquery adb_query_t,*adb_query_ptr;
 
+typedef struct adbresult {
+  const char *key;
+  double dist;
+  uint32_t qpos;
+  uint32_t ipos;
+} adb_result_t;
+
+#define ADB_REFINE_KEYLIST 1
+#define ADB_REFINE_RADIUS 2
+#define ADB_REFINE_ABSOLUTE_THRESHOLD 4
+#define ADB_REFINE_RELATIVE_THRESHOLD 8
+#define ADB_REFINE_DURATION_RATIO 16
+#define ADB_REFINE_HOP_SIZE 32
+
+typedef struct adbrefine {
+  uint32_t flags;
+  uint32_t nkeys;
+  const char **keys;
+  double radius;
+  double absolute_threshold;
+  double relative_threshold;
+  double duration_ratio; /* expandfactor */
+  uint32_t hopsize;
+} adb_refine_t;
+
+typedef struct adbqueryparameters {
+  uint32_t query_kind;
+} adb_query_parameters_t;
+
+typedef struct adbqueryresults {
+  uint32_t nresults;
+  adb_result_t *results;
+} adb_query_results_t;
+
 /* ... and for getting query results back */
 struct adbqueryresult {
 
@@ -93,7 +127,6 @@
 /*******************************************************************/
 /* Function prototypes for API */
 
-
 /* open an existing database */
 /* returns a struct or NULL on failure */
 adb_ptr audiodb_open(const char *path, int flags);