Mercurial > hg > audiodb
view libtests/0023/prog1.c @ 404:1fb8bee777e5 api-inversion
Begin working towards inverting audioDB::insert() / audiodb_insert().
New data type audiodb_datum_t, roughly corresponding to a "track" in
current audioDB parlance; it contains exactly the feature information
and metadata to record.
New function audiodb_insert_datum() to insert one of these
audiodb_datum_t objects into the database; the intention is that not
only can insertion of feature files be implemented in terms of this
function, but that it will be a useful function in its own right,
callable perhaps from PD, Max/MSP, and/or a VAMP plugin. This function
is complicated enough that it actually gets a comment.
Implement audioDB::insert() in terms of audiodb_insert_datum(), via a
wrapper which handles the slightly wacky error/non-error case of
attempting to insert features with a key that already exists in the
database.
Delete whole rafts of code. We can't quite delete everything because
there's batchinsert / batchinsert_large_adb to sort out; the good news
is that the batchinsert operation can simply be implemented as a loop
around audiodb_insert_datum() without loss of efficiency.
(There's also a stray extra audiodb_insert() in libtests/0027/, found
through an earlier iteration of this patch.)
author | mas01cr |
---|---|
date | Fri, 05 Dec 2008 22:32:43 +0000 |
parents | 94c18f128ce8 |
children | e072aa1611f5 342822c2d49a |
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}; char * databasename="testdb"; adb_query_t myadbquery={0}; adb_queryresult_t myadbqueryresult={0}; adb_query_t myadbquery2={0}; adb_queryresult_t myadbqueryresult2={0}; adb_query_t myadbquery3={0}; adb_queryresult_t myadbqueryresult3={0}; int size=0; adb_insert_t ins1[2]={{0},{0}}; /* remove old directory */ //if [ -f testdb ]; then rm -f testdb; fi clean_remove_db(databasename); /* create new db */ //${AUDIODB} -d testdb -N mydbp=audiodb_create(databasename,0,0,0); //intstring 2 > testfeature01 //floatstring 0 1 >> testfeature01 //intstring 2 > testfeature10 //floatstring 1 0 >> testfeature10 ivals[0]=2; dvals[0]=0; dvals[1]=1; maketestfile("testfeature01",ivals,dvals,2); ivals[0]=2; dvals[0]=1; dvals[1]=0; maketestfile("testfeature10",ivals,dvals,2); //cat > testfeaturefiles <<EOF //testfeature01 //testfeature10 //EOF ins1[0].features="testfeature01"; ins1[1].features="testfeature10"; //audioDB -B -d testdb -F tempfeatures //${AUDIODB} -d testdb -B -F testfeaturefiles if(audiodb_batchinsert(mydbp,ins1,2)){ returnval=-1; }; //# sequence queries require L2NORM //${AUDIODB} -d testdb -L if(audiodb_l2norm(mydbp)){ returnval=-1; }; ////echo "query point (0.0,0.5)" ////intstring 2 > testquery ////floatstring 0 0.5 >> testquery ////floatstring 0.5 0 >> testquery ivals[0]=2; dvals[0]=0; dvals[1]=0.5; dvals[2]=0.5; dvals[3]=0; maketestfile("testquery",ivals,dvals,4); //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -p 0 > testoutput //echo testfeature01 0 0 0 > test-expected-output //echo testfeature10 2 0 0 >> test-expected-output //cmp testoutput test-expected-output myadbquery.querytype="sequence"; myadbquery.feature="testquery"; myadbquery.sequencelength="1"; myadbquery.qpoint="0"; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; //printf("size:%d\n",size); //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;}; if (testoneresult(&myadbqueryresult,1,"testfeature10",2,0,0)) {returnval = -1;}; //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -p 0 > testoutput //echo testfeature01 0 0 0 > test-expected-output //cmp testoutput test-expected-output myadbquery2.querytype="sequence"; myadbquery2.feature="testquery"; myadbquery2.sequencelength="1"; myadbquery2.resultlength="1"; myadbquery2.qpoint="0"; audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); size=myadbqueryresult2.sizeRlist; ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult2,0,"testfeature01",0,0,0)) {returnval = -1;}; //echo "query point (0.5,0.0)" //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -p 1 > testoutput //echo testfeature10 0 1 0 > test-expected-output //echo testfeature01 2 1 0 >> test-expected-output //cmp testoutput test-expected-output myadbquery3.querytype="sequence"; myadbquery3.feature="testquery"; myadbquery3.sequencelength="1"; myadbquery3.qpoint="1"; audiodb_query(mydbp,&myadbquery3,&myadbqueryresult3); size=myadbqueryresult3.sizeRlist; // dump_query(&myadbquery3,&myadbqueryresult3); if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult3,0,"testfeature10",0,1,0)) {returnval = -1;}; if (testoneresult(&myadbqueryresult3,1,"testfeature01",2,1,0)) {returnval = -1;}; ////${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -p 1 > testoutput ////echo testfeature10 0 1 0 > test-expected-output ////cmp testoutput test-expected-output myadbquery2.querytype="sequence"; myadbquery2.feature="testquery"; myadbquery2.sequencelength="1"; myadbquery2.qpoint="1"; myadbquery2.resultlength="1"; audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); size=myadbqueryresult2.sizeRlist; if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult2,0,"testfeature10",0,1,0)) {returnval = -1;}; // printf("returnval:%d\n",returnval); return(returnval); }