# HG changeset patch # User mas01cr # Date 1195230448 0 # Node ID d5ae11d6cd2cd8263365dc16e78591d9ce1eabcd # Parent ae212368a87471f172d477835c79e5edf9f11c9c Query -K tests. All currently failing, as there's an off-by-one error in the handling of the keylist file. diff -r ae212368a874 -r d5ae11d6cd2c tests/0031/run-test.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0031/run-test.sh Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,74 @@ +#! /bin/sh + +. ../test-utils.sh + +if [ -f testdb ]; then rm -f testdb; fi + +${AUDIODB} -d testdb -N + +intstring 2 > testfeature01 +floatstring 0 1 >> testfeature01 +intstring 2 > testfeature10 +floatstring 1 0 >> testfeature10 + +${AUDIODB} -d testdb -I -f testfeature01 +${AUDIODB} -d testdb -I -f testfeature10 + +# 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 sequence -l 1 -f testquery > testoutput +echo testfeature01 0 0 0 > test-expected-output +echo testfeature10 2 0 0 >> test-expected-output +cmp testoutput test-expected-output +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null > testoutput +cat /dev/null > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature01 0 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature10 2 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 > testoutput +echo testfeature10 2 0 0 > 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 sequence -l 1 -f testquery > testoutput +echo testfeature10 0 0 0 > test-expected-output +echo testfeature01 2 0 0 >> test-expected-output +cmp testoutput test-expected-output +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null > testoutput +cat /dev/null > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature10 0 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature01 2 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 > testoutput +echo testfeature01 2 0 0 > test-expected-output +cmp testoutput test-expected-output + +exit 104 diff -r ae212368a874 -r d5ae11d6cd2c tests/0031/short-description --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0031/short-description Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,1 @@ +0008 with -K restriction \ No newline at end of file diff -r ae212368a874 -r d5ae11d6cd2c tests/0032/run-test.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0032/run-test.sh Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,71 @@ +#! /bin/sh + +. ../test-utils.sh + +if [ -f testdb ]; then rm -f testdb; fi + +${AUDIODB} -d testdb -N + +intstring 2 > testfeature01 +floatstring 0 1 >> testfeature01 +intstring 2 > testfeature10 +floatstring 1 0 >> testfeature10 + +${AUDIODB} -d testdb -I -f testfeature01 +${AUDIODB} -d testdb -I -f testfeature10 + +echo "query point (0.0,0.5)" +intstring 2 > testquery +floatstring 0 0.5 >> testquery + +${AUDIODB} -d testdb -Q track -l 1 -f testquery > testoutput +echo testfeature01 0.5 0 0 > test-expected-output +echo testfeature10 0 0 0 >> test-expected-output +cmp testoutput test-expected-output +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K /dev/null > testoutput +cat /dev/null > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature01 0.5 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature10 0 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt -r 1 > testoutput +echo testfeature10 0 0 0 > 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 track -l 1 -f testquery > testoutput +echo testfeature10 0.5 0 0 > test-expected-output +echo testfeature01 0 0 0 >> test-expected-output +cmp testoutput test-expected-output +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K /dev/null > testoutput +cat /dev/null > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature10 0.5 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput +echo testfeature01 0 0 0 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt -r 1 > testoutput +echo testfeature01 0 0 0 > test-expected-output +cmp testoutput test-expected-output + +exit 104 diff -r ae212368a874 -r d5ae11d6cd2c tests/0032/short-description --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0032/short-description Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,1 @@ +0009 with -K restriction \ No newline at end of file diff -r ae212368a874 -r d5ae11d6cd2c tests/0033/run-test.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0033/run-test.sh Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,68 @@ +#! /bin/sh + +. ../test-utils.sh + +if [ -f testdb ]; then rm -f testdb; fi + +${AUDIODB} -d testdb -N + +intstring 2 > testfeature01 +floatstring 0 1 >> testfeature01 +intstring 2 > testfeature10 +floatstring 1 0 >> testfeature10 + +${AUDIODB} -d testdb -I -f testfeature01 +${AUDIODB} -d testdb -I -f testfeature10 + +# 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 sequence -l 1 -f testquery -R 5 > testoutput +echo testfeature01 1 > test-expected-output +echo testfeature10 1 >> test-expected-output +cmp testoutput test-expected-output +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null -R 5 > testoutput +cat /dev/null > test-expected-output +cmp testoutput test-expected-output + +echo testfeature01 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -R 5 > testoutput +echo testfeature01 1 > test-expected-output +cmp testoutput test-expected-output +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -R 5 > testoutput +echo testfeature10 1 > test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 -R 5 > testoutput +echo testfeature10 1 > test-expected-output +cmp testoutput test-expected-output + +# NB: one might be tempted to insert a test here for having both keys +# in the keylist, but in non-database order, and then checking that +# the result list is also in that non-database order. I think that +# would be misguided, as the efficient way of dealing with such a +# keylist is to advance as-sequentially-as-possible through the +# database; it just so happens that our current implementation is not +# so smart. + +echo "query point (0.5,0.0)" +intstring 2 > testquery +floatstring 0.5 0 >> testquery + +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -R 5 > testoutput +echo testfeature01 1 > test-expected-output +echo testfeature10 1 >> test-expected-output +cmp testoutput test-expected-output + +echo testfeature10 > testkl.txt +${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 -R 5 > testoutput +echo testfeature10 1 > test-expected-output +cmp testoutput test-expected-output + +exit 104 diff -r ae212368a874 -r d5ae11d6cd2c tests/0033/short-description --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/0033/short-description Fri Nov 16 16:27:28 2007 +0000 @@ -0,0 +1,1 @@ +0010 with -K restriction \ No newline at end of file