Mercurial > hg > audiodb
view pertrackaccumulator.h @ 459:fcc6f7c4856b api-inversion
No more global shingle vector of vectors.
Convert audioDB::index_initialize_shingles and
audioDB::index_norm_shingles to plain old functions. In doing so, the
latter in particular acquires a silly argument list; we need that
complexity for now because it's called both from audioDB::query (which
we're currently inverting) and from audioDB::index (which is out of
scope for now).
The loss of the global vv thing made me check up on memory discipline
[hence the new API function audiodb_query_free_results() as well as the
internal audiodb_index_delete_shingles()]. It's not too bad, but there
are plenty of leaks for those with time to do
AUDIODB="valgrind --leak-check=full ../../audioDB" sh ./run-test.sh
on their favourite test case. For example, the Radius reporters leak
one triple per hit.
(Honestly, C++ memory management is teh suck.)
author | mas01cr |
---|---|
date | Sun, 28 Dec 2008 22:43:50 +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; }