Mercurial > hg > audiodb
view libtests/0025/prog1.c @ 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 | 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" void maketimesfile(char * filename); 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}; int size=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 > testfeature //floatstring 0 0.5 >> testfeature //floatstring 0.5 0 >> testfeature ivals[0]=2; dvals[0]=0; dvals[1]=0.5; dvals[2]=0.5; dvals[3]=0; maketestfile("testfeature",ivals,dvals,4); //cat > testtimes <<EOF //0 //1 //2 //EOF maketimesfile("testtimes"); //${AUDIODB} -d testdb -I -f testfeature -t testtimes myinsert.features="testfeature"; if(audiodb_insert(mydbp,&myinsert)){ 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 ivals[0]=2; dvals[0]=0; dvals[1]=0.5; maketestfile("testquery",ivals,dvals,2); //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput //echo testfeature 1 0 0 > test-expected-output //cmp testoutput test-expected-output myadbquery.querytype="sequence"; myadbquery.feature="testquery"; myadbquery.sequencelength="1"; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; ////${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput ////echo testfeature 0 0 0 > test-expected-output ////cmp testoutput test-expected-output myadbquery.querytype="sequence"; myadbquery.feature="testquery"; myadbquery.sequencelength="1"; myadbquery.numpoints="1"; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; ////echo "query point (0.5,0.0)" ////intstring 2 > testquery ////floatstring 0.5 0 >> testquery ivals[0]=2; dvals[0]=0.5; dvals[1]=0.0; maketestfile("testquery",ivals,dvals,2); ////${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput ////echo testfeature 1 0 1 > test-expected-output ////cmp testoutput test-expected-output myadbquery.querytype="sequence"; myadbquery.feature="testquery"; myadbquery.sequencelength="1"; myadbquery.numpoints=NULL; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;}; ////${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput ////echo testfeature 0 0 1 > test-expected-output ////cmp testoutput test-expected-output myadbquery.querytype="sequence"; myadbquery.feature="testquery"; myadbquery.sequencelength="1"; myadbquery.numpoints="1"; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;}; //printf("returnval:%d\n",returnval); return(returnval); } void maketimesfile(char * filename){ FILE * myfile; myfile=fopen(filename,"w"); fprintf(myfile,"0\n"); fprintf(myfile,"1\n"); fprintf(myfile,"2\n"); fflush(myfile); fclose(myfile); }