Mercurial > hg > audiodb
view pertrackaccumulator.h @ 465:1030664df98c api-inversion
No more audioDB::index_allocate and audioDB::index_init_query
No more SERVER_LSH_INDEX_SINGLETON, either; instead each adb_t contains
a single cache of the last used in-core index. At the moment, this
cache is unused by the server (and the previous cache code has been
replaced by a comment), but I think that this way everyone can be
allowed to benefit without anyone having to explicitly manage indexes
themselves.
I'm not going to say how long I wandered in a maze of valgrind before
giving up and keeping the hacky workaround for loading the lsh tables
[see the FIXME comment in audiodb_index_init_query()]; let's just say
that it was long enough to find the extra bonus crashy close(lshfid) in
audioDB::index_index_db.
Also, delete the abstraction-inverting LSH stuff from query.cpp where we
are making our reporters; the fix for that, which is presumably when
creating small indexes for large datasets, is to implement
space-efficient reporters. (The accumulator code, which is my second
attempt, is more space-efficient than the reporters; inspiration may
wish to be drawn...)
author | mas01cr |
---|---|
date | Tue, 30 Dec 2008 23:56:57 +0000 |
parents | 580f696c817c |
children | e21a3db643af |
line wrap: on
line source
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; }