Mercurial > hg > audiodb
view libtests/0036/prog1.c @ 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 | 25a4d1799c08 |
children | e072aa1611f5 |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include <sysexits.h> #include <fcntl.h> #include <dirent.h> #include <unistd.h> #include <sys/stat.h> /* * * #define NDEBUG * * */ #include <assert.h> #include "../../audioDB_API.h" #include "../test_utils_lib.h" int main(int argc, char **argv){ int returnval=0; adb_ptr mydbp={0}; int ivals[10]; double dvals[10]; adb_insert_t myinsert={0}; unsigned int myerr=0; char * databasename="testdb"; adb_query_t myadbquery={0}; adb_queryresult_t myadbqueryresult={0}; adb_query_t myadbquery2={0}; adb_queryresult_t myadbqueryresult2={0}; int size=0; return 14; //#! /bin/bash // //. ../test-utils.sh // //if [ -f testdb ]; then rm -f testdb; fi // //${AUDIODB} -d testdb -N // //intstring 2 > testfeature01 //floatstring 0 1 >> testfeature01 //floatstring 1 0 >> testfeature01 //intstring 2 > testfeature10 //floatstring 1 0 >> testfeature10 //floatstring 0 1 >> testfeature10 // //cat > testfeaturefiles <<EOF //testfeature01 //testfeature10 //EOF // //${AUDIODB} -d testdb -B -F testfeaturefiles // //# sequence queries require L2NORM //${AUDIODB} -d testdb -L // //echo "query point (0.0,0.5)" //intstring 2 > testquery //floatstring 0 0.5 >> testquery // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput //echo testfeature01 1 > test-expected-output //echo 0 0 0 >> test-expected-output //echo 2 0 1 >> test-expected-output //echo testfeature10 1 >> test-expected-output //echo 0 0 1 >> test-expected-output //echo 2 0 0 >> test-expected-output //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput //echo testfeature01 0 > test-expected-output //echo 0 0 0 >> test-expected-output //echo testfeature10 0 >> test-expected-output //echo 0 0 1 >> test-expected-output //cmp testoutput test-expected-output // //echo "query point (0.5,0.0)" //intstring 2 > testquery //floatstring 0.5 0 >> testquery // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput //echo testfeature01 1 > test-expected-output //echo 0 0 1 >> test-expected-output //echo 2 0 0 >> test-expected-output //echo testfeature10 1 >> test-expected-output //echo 0 0 0 >> test-expected-output //echo 2 0 1 >> test-expected-output //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput //cmp testoutput test-expected-output // //${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput //echo testfeature01 0 > test-expected-output //echo 0 0 1 >> test-expected-output //echo testfeature10 0 >> test-expected-output //echo 0 0 0 >> test-expected-output //cmp testoutput test-expected-output // //exit 104 returnval=-1; return(returnval); }