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