Mercurial > hg > audiodb
view nearestaccumulator.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.
author | mas01cr |
---|---|
date | Sat, 10 Jan 2009 16:47:57 +0000 |
parents | |
children | e21a3db643af |
line wrap: on
line source
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; }