Mercurial > hg > audiodb
view tests/0042/run-test.sh @ 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 | da901c62e569 |
children |
line wrap: on
line source
#! /bin/bash . ../test-utils.sh if [ -f testdb ]; then rm -f testdb; fi # Make LARGE_ADB ${AUDIODB} -d testdb -N --ntracks 50000 ${AUDIODB} -d testdb -P ${AUDIODB} -d testdb -L ${AUDIODB} -d testdb -S | grep "flags:" > testoutput echo "flags: l2norm[on] minmax[off] power[on] times[off] largeADB[on]" > test-expected-output cmp testoutput test-expected-output intstring 2 > testfeature floatstring 0 1 >> testfeature floatstring 1 0 >> testfeature floatstring 1 0 >> testfeature floatstring 0 1 >> testfeature intstring 1 > testpower floatstring -0.5 >> testpower floatstring -1 >> testpower floatstring -1 >> testpower floatstring -0.5 >> testpower echo testfeature > testList.txt echo testpower > pwrList.txt echo key1 > keyList.txt echo testfeature >> testList.txt echo testpower >> pwrList.txt echo key2 >> keyList.txt ${AUDIODB} -d testdb -B -F testList.txt -W pwrList.txt -K keyList.txt # Cleanup rm testList.txt pwrList.txt keyList.txt echo "query points (0.0,0.5),(0.0,0.5),(0.5,0.0)" intstring 2 > testquery floatstring 0 0.5 >> testquery floatstring 0 0.5 >> testquery floatstring 0.5 0 >> testquery # LARGE_ADB requires an INDEX ${AUDIODB} -d testdb -X -R 1 -l 1 # LARGE_ADB query from key ${AUDIODB} -d testdb -Q sequence -l 1 -k key1 -R 1 --absolute-threshold -4.5 > testoutput echo key2 1 > test-expected-output cmp testoutput test-expected-output # LARGE_ADB query from feature file and power file ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testpower -R 1 --absolute-threshold -4.5 > testoutput echo key1 1 > test-expected-output echo key2 1 >> test-expected-output cmp testoutput test-expected-output # WS WSPORT=10020 start_server ${AUDIODB} ${WSPORT} # LARGE_ADB WS query from key ${AUDIODB} -c localhost:${WSPORT} -d testdb -Q sequence -l 1 -k key1 -R 1 --absolute-threshold -4.5 -n 1 --lsh_exact > testoutput echo key2 0 0 0 > test-expected-output cmp testoutput test-expected-output # LARGE_ADB WS query from feature file and power file tests ${AUDIODB} -c localhost:${WSPORT} -d testdb -Q sequence -l 1 -f testquery -w testpower -R 1 --absolute-threshold -4.5 -n 1 > testoutput echo key1 1 > test-expected-output echo key2 1 >> test-expected-output cmp testoutput test-expected-output stop_server $! exit 104