Mercurial > hg > audiodb
view pertrackaccumulator.h @ 663:bcc7a6ddb2c8
Better treatment of refine.hopsize
Only adapt the query loop hopping if ADB_REFINE_HOP_SIZE is actually on the
refine flags, rather than blithely taking the value of refine.hopsize.
Significantly reduces the chances of inadvertently causing an infinite loop.
Adjust the tests to remove the 23 now useless instances of
"refine.hopsize = 1;"
Closes trac ticket #16
author | mas01cr |
---|---|
date | Thu, 28 Jan 2010 10:23:42 +0000 |
parents | e21a3db643af |
children | a35ca2d5f238 |
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; }; template <class T> PerTrackAccumulator<T>::PerTrackAccumulator(unsigned int pointNN, unsigned int trackNN) : pointNN(pointNN), trackNN(trackNN), queues(0) { queues = new std::map<adb_result_t, std::priority_queue< adb_result_t, std::vector<adb_result_t>, T > *, adb_result_key_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; } } template <class T> void PerTrackAccumulator<T>::add_point(adb_result_t *r) { if(!isnan(r->dist)) { 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; }