Mercurial > hg > audiodb
view tests/run-tests.sh @ 405:ef4792df8f93 api-inversion
invert audioDB::insert / audiodb_insert().
Start off by removing audioDB::insertDatum, and essentially reusing it
as audiodb_insert. We now ignore the fact that the command-line parsing
code has "helpfully" opened a std::ifstream for the times file and an fd
for the power file, and simply go ahead and do our own dirty work.
We can delete audioDB::insertDatum entirely, but unfortunately we can't
delete audioDB::insertPowerData and audioDB::insertTimestamps, because
the index and query code respectively use them. Instead, move the two
methods closer to their single uses.
audiodb_insert() is perhaps not as short and simple as it might have
been hoped given the existence of audiodb_insert_datum(); some of that
is C and its terribly way of making you pay every time you use dynamic
memory; some of it is the fact that the three different files (feature,
times, power) each requires slightly different treatment. Hey ho.
We can implement audiodb_batchinsert() in terms of audiodb_insert(); the
function is pleasingly small. We can't quite use it for
audioDB::batchinsert yet, as we have to deal with the O2_FLAG_LARGE_ADB
case (which codepath is untested in libtests/).
This means that we can delete whole swathes of hideous code from
audioDB.cpp, including not just the versions of audiodb_insert() and
audiodb_batchinsert() but also an entire audioDB constructor. Yay.
(audioDB::unitNormAndInsertL2 has also died a deserved death).
author | mas01cr |
---|---|
date | Fri, 05 Dec 2008 22:32:49 +0000 |
parents | fe4dc39b2dd7 |
children | 216b55457009 |
line wrap: on
line source
#! /bin/bash AUDIODB=../../${EXECUTABLE:-audioDB} export AUDIODB if [ -x ${AUDIODB#../} ]; then : else echo Cannot execute audioDB: ${AUDIODB#../} exit 1 fi if [ "$1" = "--full" ]; then pattern="[0-9][0-9][0-9][0-9]*" else pattern="[0-8][0-9][0-9][0-9]*" fi for file in ${pattern}; do if [ -d ${file} ]; then if [ -f ${file}/run-test.sh ]; then echo -n Running test ${file} if [ -f ${file}/short-description ]; then awk '{ printf(" (%s)",$0) }' < ${file}/short-description fi echo -n : (cd ${file} && /bin/bash ./run-test.sh > test.out 2> test.err) EXIT_STATUS=$? if [ ${EXIT_STATUS} -eq 14 ]; then echo " n/a." elif [ ${EXIT_STATUS} -ne 104 ]; then echo " failed (exit status ${EXIT_STATUS})." FAILED=true else echo " success." fi else echo Skipping test ${file} fi fi done if [ -z "${FAILED}" ]; then exit 0 else exit 1 fi