Mercurial > hg > audiodb
view nearestaccumulator.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 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; }