annotate tests/0024/run-test.sh @ 453:16a903968d18 api-inversion

Almost finish with audioDB::query_loop. This patch is a little bit noisy, because we rename adb->keys to adb->keymap, introduce a new vector adb->keys (essentially to replace fileTable), and introduce new functionality (both include and exclude keylists in adb_query_refine_t) as well as modifying the query_loop function itself to take advantage of all of these goodies. Oh, and we also fix an embarrassing state bug in adb->track_offsets for insert -- what was I thinking? (Thank you, regression test suites). Since we are on a private branch at the moment, we can take the luxury of renumbering the ADB_REFINE_ flags to include the exclude list at the logical place; once we have an ABI to support, that won't be possible. Now audioDB::query builds up include and exclude lists as appropriate; query_loop does an [O(NlogN) probably] buildup of the keys to consider, and then iterates over tracks sequentially, seeking only if one or more tracks have been excluded. No more trackFile, yay! The only remaining thing to deal with is the accumulator. It's easy enough to pass it around, but I want to read the indexed version before doing so to see how that all fits together.
author mas01cr
date Wed, 24 Dec 2008 10:57:14 +0000
parents fe4dc39b2dd7
children
rev   line source
mas01cr@252 1 #! /bin/bash
mas01cr@130 2
mas01cr@130 3 . ../test-utils.sh
mas01cr@130 4
mas01cr@130 5 if [ -f testdb ]; then rm -f testdb; fi
mas01cr@130 6
mas01cr@130 7 ${AUDIODB} -d testdb -N
mas01cr@130 8
mas01cr@130 9 intstring 2 > testfeature01
mas01cr@130 10 floatstring 0 1 >> testfeature01
mas01cr@130 11 intstring 2 > testfeature10
mas01cr@130 12 floatstring 1 0 >> testfeature10
mas01cr@130 13
mas01cr@130 14 cat > testfeaturefiles <<EOF
mas01cr@130 15 testfeature01
mas01cr@130 16 testfeature10
mas01cr@130 17 EOF
mas01cr@130 18
mas01cr@130 19 ${AUDIODB} -d testdb -B -F testfeaturefiles
mas01cr@130 20
mas01cr@130 21 # sequence queries require L2NORM
mas01cr@130 22 ${AUDIODB} -d testdb -L
mas01cr@130 23
mas01cr@130 24 echo "exhaustive search"
mas01cr@130 25 intstring 2 > testquery
mas01cr@130 26 floatstring 0 0.5 >> testquery
mas01cr@130 27 floatstring 0.5 0 >> testquery
mas01cr@130 28
mas01cr@130 29 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -e > testoutput
mas01cr@130 30 echo testfeature01 1 0 0 > test-expected-output
mas01cr@130 31 echo testfeature10 1 1 0 >> test-expected-output
mas01cr@130 32 cmp testoutput test-expected-output
mas01cr@130 33 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 -e > testoutput
mas01cr@130 34 echo testfeature01 0 0 0 > test-expected-output
mas01cr@130 35 echo testfeature10 0 1 0 >> test-expected-output
mas01cr@130 36 cmp testoutput test-expected-output
mas01cr@130 37
mas01cr@130 38 exit 104