Mercurial > hg > audiodb
changeset 492:f6b126b018d8 api-inversion
Yet more audiodb_query() deletions.
Also delete the libtests/notes file, with its misleading and wrong
questions, to avoid further confusion.
| author | mas01cr |
|---|---|
| date | Sat, 10 Jan 2009 15:33:07 +0000 |
| parents | 29d28cfe0222 |
| children | 1950d76be128 |
| files | libtests/0022/prog1.c libtests/0022/short-description libtests/0023/prog1.c libtests/0023/short-description libtests/0024/prog1.c libtests/0024/short-description libtests/0025/prog1.c libtests/0025/short-description libtests/0026/prog1.c libtests/0026/short-description libtests/0027/prog1.c libtests/0027/short-description libtests/0028/prog1.c libtests/0028/short-description libtests/notes |
| diffstat | 15 files changed, 456 insertions(+), 1159 deletions(-) [+] |
line wrap: on
line diff
--- a/libtests/0022/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0022/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,138 +1,66 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; + adb_insert_t batch[2] = {{0}, {0}}; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; - int returnval=0; - adb_ptr mydbp={0}; - int ivals[10]; - double dvals[10]; - char * databasename="testdb"; - adb_query_t myadbquery={0}; - adb_queryresult_t myadbqueryresult={0}; - adb_query_t myadbquery2={0}; - adb_queryresult_t myadbqueryresult2={0}; - adb_insert_t ins1[2]={{0},{0}}; - int size=0; + maketestfile("testfeature01", (int[1]){2}, (double[2]) {0, 1}, 2); + maketestfile("testfeature10", (int[1]){2}, (double[2]) {1, 0}, 2); - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + batch[0].features="testfeature01"; + batch[1].features="testfeature10"; + if(audiodb_batchinsert(adb, batch, 2)) + return 1; + if(audiodb_l2norm(adb)) + return 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.sequence_start = 0; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; - if (!mydbp){ returnval=-1;}; + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; -//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); + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + result_present_or_fail(results, "testfeature10", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); + + spec.params.ntracks = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); + spec.qid.datum->data = (double [2]) {0.5, 0}; + spec.params.ntracks = 10; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature10", 0, 0, 0); + result_present_or_fail(results, "testfeature01", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//cat > testfeaturefiles <<EOF -//testfeature01 -//testfeature10 -//EOF + spec.params.ntracks = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature10", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); - ins1[0].features="testfeature01"; - ins1[1].features="testfeature10"; + audiodb_close(adb); -//audioDB --BATCHINSERT -d testdb --featureList 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 - 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 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"; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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 > testoutput -//echo testfeature01 0 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.resultlength="1"; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature01",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; - maketestfile("testquery",ivals,dvals,2); - -////${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 - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - if (size != 2) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature10",0,0,0)) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,1,"testfeature01",2,0,0)) {returnval = -1;}; - - -////${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 > testoutput -////echo testfeature10 0 0 0 > test-expected-output -////cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.resultlength="1"; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature10",0,0,0)) {returnval = -1;}; - - audiodb_close(mydbp); -// fprintf(stderr,"returnval:%d\n",returnval); - - return(returnval); + return 104; } -
--- a/libtests/0022/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0022/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ -Batchinsert / sequence search with lib +Batchinsert / sequence search with library
--- a/libtests/0023/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0023/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,145 +1,66 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; + adb_insert_t batch[2]={{0},{0}}; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; - 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}}; + maketestfile("testfeature01", (int[1]){2}, (double[2]) {0, 1}, 2); + maketestfile("testfeature10", (int[1]){2}, (double[2]) {1, 0}, 2); - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + batch[0].features="testfeature01"; + batch[1].features="testfeature10"; + if(audiodb_batchinsert(adb, batch, 2)) + return 1; + if(audiodb_l2norm(adb)) + return 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + adb_datum_t query = {2, 2, "testquery", (double[4]) {0, 0.5, 0.5, 0}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.sequence_start = 0; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; -//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); + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; + + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + result_present_or_fail(results, "testfeature10", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//cat > testfeaturefiles <<EOF -//testfeature01 -//testfeature10 -//EOF - ins1[0].features="testfeature01"; - ins1[1].features="testfeature10"; + spec.params.ntracks = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); + + spec.qid.sequence_start = 1; + spec.params.ntracks = 10; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature10", 0, 1, 0); + result_present_or_fail(results, "testfeature01", 2, 1, 0); + audiodb_query_free_results(adb, &spec, results); -//audioDB -B -d testdb -F tempfeatures -//${AUDIODB} -d testdb -B -F testfeaturefiles - if(audiodb_batchinsert(mydbp,ins1,2)){ - returnval=-1; - }; + spec.params.ntracks = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature10", 0, 1, 0); + audiodb_query_free_results(adb, &spec, results); -//# sequence queries require L2NORM -//${AUDIODB} -d testdb -L - if(audiodb_l2norm(mydbp)){ - returnval=-1; - }; + audiodb_close(adb); -////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); - - ///* 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; - - 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); + return 104; } -
--- a/libtests/0023/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0023/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ -as 0022 but with -p with lib +as 0022 but with -p with library
--- a/libtests/0024/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0024/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,103 +1,53 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; + adb_insert_t batch[2]={{0}, {0}}; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; - int returnval=0; - adb_ptr mydbp={0}; - int ivals[10]; - double dvals[10]; - adb_insert_t myinsert={0}; - unsigned int myerr=0; - char * databasename="testdb"; - adb_query_t myadbquery={0}; - adb_queryresult_t myadbqueryresult={0}; - adb_query_t myadbquery2={0}; - adb_queryresult_t myadbqueryresult2={0}; - int size=0; - adb_insert_t ins1[2]={0}; + maketestfile("testfeature01", (int[1]){2}, (double[2]) {0, 1}, 2); + maketestfile("testfeature10", (int[1]){2}, (double[2]) {1, 0}, 2); - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + batch[0].features="testfeature01"; + batch[1].features="testfeature10"; + if(audiodb_batchinsert(adb, batch, 2)) + return 1; + if(audiodb_l2norm(adb)) + return 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + adb_datum_t query = {2, 2, "testquery", (double[4]) {0, 0.5, 0.5, 0}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.flags = ADB_QID_FLAG_EXHAUSTIVE; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; -//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); + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; + + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 4) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + result_present_or_fail(results, "testfeature01", 2, 1, 0); + result_present_or_fail(results, "testfeature10", 2, 0, 0); + result_present_or_fail(results, "testfeature10", 0, 1, 0); + audiodb_query_free_results(adb, &spec, results); -//cat > testfeaturefiles <<EOF -//testfeature01 -//testfeature10 -//EOF - ins1[0].features="testfeature01"; - ins1[1].features="testfeature10"; + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature01", 0, 0, 0); + result_present_or_fail(results, "testfeature10", 0, 1, 0); + audiodb_query_free_results(adb, &spec, results); - -//${AUDIODB} -d testdb -B -F testfeaturefiles - returnval=audiodb_batchinsert(mydbp,ins1,2); - -//# sequence queries require L2NORM -//${AUDIODB} -d testdb -L - audiodb_l2norm(mydbp); - -//echo "exhaustive search" -//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 -e > testoutput -//echo testfeature01 1 0 0 > test-expected-output -//echo testfeature10 1 1 0 >> test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.exhaustive=1; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - //printf("size:%d\n",size); - ///* check the test values */ - if (size != 2) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature01",1,0,0)) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,1,"testfeature10",1,1,0)) {returnval = -1;}; - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 -e > testoutput -//echo testfeature01 0 0 0 > test-expected-output -//echo testfeature10 0 1 0 >> test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.exhaustive=1; - myadbquery.numpoints="1"; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - //printf("size:%d\n",size); - ///* check the test values */ - if (size != 2) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,1,"testfeature10",0,1,0)) {returnval = -1;}; - - - printf("returnval:%d\n",returnval); - return(returnval); + return 104; } -
--- a/libtests/0024/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0024/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ --l 1 exhaustive search like 0022 with lib +-l 1 exhaustive search like 0022 with library
--- a/libtests/0025/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0025/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,141 +1,60 @@ #include "audioDB_API.h" #include "test_utils_lib.h" -void maketimesfile(char * filename); +int main(int argc, char **argv) { + adb_t *adb; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; - 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; + adb_datum_t datum = {2, 2, "testfeature", (double[4]) {0, 0.5, 0.5, 0}, + NULL, (double[4]) {0, 1, 1, 2}}; + if(audiodb_insert_datum(adb, &datum)) + return 1; + if(audiodb_l2norm(adb)) + return 1; - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.sequence_start = 0; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; -//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); + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//cat > testtimes <<EOF -//0 -//1 -//2 -//EOF - maketimesfile("testtimes"); + spec.qid.datum->data = (double[2]) {0.5, 0}; + spec.params.npoints = 10; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); + + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + audiodb_query_free_results(adb, &spec, results); -//${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; - - ///* 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; - - ///* 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; - - ///* 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; - - ///* 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); + return 104; } - -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); - -}
--- a/libtests/0025/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0025/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ -insertion with times with lib +insertion with times with library
--- a/libtests/0026/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0026/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,43 +1,17 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; + + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; -int main(int argc, char **argv){ + if(audiodb_power(adb)) + return 1; + if(audiodb_power(adb)) + return 1; - int returnval=0; - adb_ptr mydbp={0}; - // int ivals[10]; - // double dvals[10]; - // adbinsert myinsert={0}; - // unsigned int myerr=0; - char * databasename="testdb"; - // adbquery myadbquery={0}; - // adbqueryresult myadbqueryresult={0}; - // adbquery myadbquery2={0}; - // adbqueryresult myadbqueryresult2={0}; - int myerror=0; - - - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); - - /* create new db */ - //${AUDIODB} -N -d testdb - mydbp=audiodb_create(databasename,0,0,0); - - /* power flag on */ - //${AUDIODB} -P -d testdb - //${AUDIODB} -d testdb -P - myerror=audiodb_power(mydbp); - if (myerror){ - returnval=-1; - } - - //# should fail (no db given) - //expect_clean_error_exit ${AUDIODB} -P - /* not relevent, API wouldn't compile */ - - return(returnval); + return 104; } -
--- a/libtests/0026/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0026/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ -command-line -P handling with lib +power-flag handling with library
--- a/libtests/0027/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0027/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,348 +1,144 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB, 0, 0, 0))) + return 1; - int returnval=0; - adb_ptr mydbp={0}; - int ivals[10]; - double dvals[10]; - adb_insert_t myinsert={0}; - unsigned int myerr=0; - char * databasename="testdb"; - adb_query_t myadbquery={0}; - adb_queryresult_t myadbqueryresult={0}; - adb_query_t myadbquery2={0}; - adb_queryresult_t myadbqueryresult2={0}; - int size=0; + adb_datum_t feature = {2, 2, "testfeature", (double[4]){0, 1, 1, 0}, + (double[2]){-0.5, -1}}; + if(!audiodb_insert_datum(adb, &feature)) + return 1; + if(audiodb_power(adb)) + return 1; + feature.power = NULL; + if(!audiodb_insert_datum(adb, &feature)) + return 1; + feature.power = (double[2]){-0.5, -1}; + if(audiodb_insert_datum(adb, &feature)) + return 1; + if(audiodb_l2norm(adb)) + return 1; - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.sequence_start = 0; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; - //intstring 2 > testfeature - //floatstring 0 1 >> testfeature - //floatstring 1 0 >> testfeature - ivals[0]=2; - dvals[0]=0; dvals[1]=1; dvals[2]=1; dvals[3]=0; - maketestfile("testfeature",ivals,dvals,4); + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); - //intstring 1 > testpower - //floatstring -0.5 >> testpower - //floatstring -1 >> testpower - ivals[0]=1; - dvals[0]=-0.5; dvals[1]=-1; - maketestfile("testpower",ivals,dvals,2); + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); - /* insert breaks because power flag off and power insert */ - //expect_clean_error_exit ${AUDIODB} -d testdb -I -f testfeature -w testpower - myinsert.features="testfeature"; - myinsert.power="testpower"; - if (!audiodb_insert(mydbp,&myinsert)){ returnval=-1; } + spec.qid.datum->data = (double [2]) {0.5, 0}; + spec.params.npoints = 10; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); + + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + audiodb_query_free_results(adb, &spec, results); - - /* make sure power can be turned on */ -//${AUDIODB} -d testdb -P - if(audiodb_power(mydbp)){ returnval=-1; }; + /* queries with associated power data */ + spec.qid.datum->data = (double [2]) {0, 0.5}; + spec.qid.datum->power = (double [1]) {-0.5}; + spec.params.npoints = 10; + spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD; + spec.refine.absolute_threshold = -1.4; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); + spec.refine.absolute_threshold = -0.6; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); - /* inserts now require power also */ -////expect_clean_error_exit ${AUDIODB} -d testdb -I -f testfeature - myinsert.features="testfeature"; - myinsert.power=NULL; - //myerr=audiodb_insert(mydbp,&myinsert); - if (!audiodb_insert(mydbp,&myinsert)){ returnval=-1; } + spec.refine.absolute_threshold = -0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 0) return 1; + audiodb_query_free_results(adb, &spec, results); - /* now make a real insert */ -//${AUDIODB} -d testdb -I -f testfeature -w testpower - myinsert.features="testfeature"; - myinsert.power="testpower"; - //myerr=audiodb_insert(mydbp,&myinsert); - if (audiodb_insert(mydbp,&myinsert)){ returnval=-1; } + spec.refine.absolute_threshold = 0; + spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD; + spec.refine.relative_threshold = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); + spec.refine.relative_threshold = 0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); - //# sequence queries require L2NORM - //${AUDIODB} -d testdb -L - if(audiodb_l2norm(mydbp)){ returnval=-1; }; + spec.qid.datum->data = (double [2]) {0.5, 0}; + spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD; + spec.refine.absolute_threshold = -1.4; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); + spec.refine.absolute_threshold = -0.6; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); - //# queries without power files should run as before - //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); + spec.refine.absolute_threshold = -0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 0) return 1; + audiodb_query_free_results(adb, &spec, results); + spec.refine.absolute_threshold = 0; + spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD; + spec.refine.relative_threshold = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); - /* query 1 */ - //${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; + spec.refine.relative_threshold = 0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; + audiodb_close(adb); -//${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; - - /* 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; - - /* 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; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;}; - - - -//# queries with power files might do something different -//echo "query point (0.0,0.5), p=-0.5" -//intstring 2 > testquery -//floatstring 0 0.5 >> testquery -//intstring 1 > testquerypower -//floatstring -0.5 >> testquerypower - ivals[0]=2; - dvals[0]=-0; dvals[1]=0.5; - maketestfile("testquery",ivals,dvals,2); - ivals[0]=1; - dvals[0]=-0.5; - maketestfile("testquerypower",ivals,dvals,1); - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-1.4 > testoutput -//echo testfeature 1 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.power="testquerypower"; - myadbquery.numpoints=NULL; - myadbquery.absolute_threshold=-1.4; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - /* 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 -w testquerypower --absolute-threshold=-0.6 > testoutput -//echo testfeature 0 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.power="testquerypower"; - myadbquery.numpoints=NULL; - myadbquery.absolute_threshold=-0.6; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput -//cat /dev/null > test-expected-output -//cmp testoutput test-expected-output - - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.power="testquerypower"; - myadbquery.numpoints=NULL; - myadbquery.absolute_threshold=-0.2; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - /* check the test values */ - if (size != 0) {returnval = -1;}; - - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput -//echo testfeature 1 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.power="testquerypower"; - myadbquery.numpoints=NULL; - myadbquery.absolute_threshold=0; - myadbquery.relative_threshold=1; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - /* 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 -w testquerypower --relative-threshold=0.2 > testoutput -//echo testfeature 0 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.sequencelength="1"; - myadbquery.power="testquerypower"; - myadbquery.numpoints=NULL; - myadbquery.absolute_threshold=0; - myadbquery.relative_threshold=0.2; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - /* 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), p=-0.5" -//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 -Q sequence -d testdb -f testquery -w testquerypower -l 1 --absolute-threshold -1.400000 -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-1.4 > testoutput -//echo testfeature 1 0 1 > test-expected-output -//cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.power="testquerypower"; - myadbquery2.numpoints=NULL; - myadbquery2.absolute_threshold=-1.4; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature",1,0,1)) {returnval = -1;}; - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.6 > testoutput -//echo testfeature 2 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.power="testquerypower"; - myadbquery2.numpoints=NULL; - myadbquery2.absolute_threshold=-0.6; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature",2,0,0)) {returnval = -1;}; - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput -//cat /dev/null > test-expected-output -//cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.power="testquerypower"; - myadbquery2.numpoints=NULL; - myadbquery2.absolute_threshold=-0.2; - myadbquery2.relative_threshold=0.0; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - /* check the test values */ - if (size != 0) {returnval = -1;}; - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput -//echo testfeature 1 0 1 > test-expected-output -//cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.power="testquerypower"; - myadbquery2.numpoints=NULL; - myadbquery2.absolute_threshold=0.0; - myadbquery2.relative_threshold=1; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature",1,0,1)) {returnval = -1;}; - - - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=0.2 > testoutput -//echo testfeature 2 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery2.querytype="sequence"; - myadbquery2.feature="testquery"; - myadbquery2.sequencelength="1"; - myadbquery2.power="testquerypower"; - myadbquery2.numpoints=NULL; - myadbquery2.absolute_threshold=-0.0; - myadbquery2.relative_threshold=0.1; - audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2); - size=myadbqueryresult2.sizeRlist; - - /* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult2,0,"testfeature",2,0,0)) {returnval = -1;}; - -// printf("returnval:%d\n",returnval); - return(returnval); + return 104; } -
--- a/libtests/0027/short-description Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0027/short-description Sat Jan 10 15:33:07 2009 +0000 @@ -1,1 +1,1 @@ -0006 with power with lib +0006 with power with library
--- a/libtests/0028/prog1.c Sat Jan 10 15:33:02 2009 +0000 +++ b/libtests/0028/prog1.c Sat Jan 10 15:33:07 2009 +0000 @@ -1,339 +1,151 @@ #include "audioDB_API.h" #include "test_utils_lib.h" +int main(int argc, char **argv) { + adb_t *adb; + adb_insert_t batch[1]={{0}}; -int main(int argc, char **argv){ + clean_remove_db(TESTDB); + if(!(adb = audiodb_create(TESTDB,0,0,0))) + return 1; - int returnval=0; - adb_ptr mydbp={0}; - int ivals[10]; - double dvals[10]; - char * databasename="testdb"; - adb_query_t myadbquery={0}; - adb_queryresult_t myadbqueryresult={0}; - int size=0; - adb_insert_t ins1[2]={{0},{0}}; + maketestfile("testfeature", (int[1]) {2}, (double[4]){0, 1, 1, 0}, 4); + maketestfile("testpower", (int[1]) {1}, (double[2]) {-0.5, -1}, 2); + batch[0].features="testfeature"; + batch[0].power="testpower"; + if(!audiodb_batchinsert(adb, batch, 1)) + return 1; - /* remove old directory */ - //if [ -f testdb ]; then rm -f testdb; fi - clean_remove_db(databasename); + if(audiodb_power(adb)) + return 1; - /* create new db */ - //${AUDIODB} -d testdb -N - mydbp=audiodb_create(databasename,0,0,0); + batch[0].power=NULL; + if(!audiodb_batchinsert(adb, batch, 1)) + return 1; -//intstring 2 > testfeature -//floatstring 0 1 >> testfeature -//floatstring 1 0 >> testfeature - ivals[0]=2; - dvals[0]=0; dvals[1]=1; dvals[2]=1; dvals[3]=0; - maketestfile("testfeature",ivals,dvals,4); + batch[0].power="testpower"; + if(audiodb_batchinsert(adb, batch, 1)) + return 1; -//intstring 1 > testpower -//floatstring -0.5 >> testpower -//floatstring -1 >> testpower - ivals[0]=1; - dvals[0]=-0.5; dvals[1]=-1; - maketestfile("testpower",ivals,dvals,2); + if(audiodb_l2norm(adb)) + return 1; -//echo testfeature > testFeatureList.txt -//echo testpower > testPowerList.txt - ins1[0].features="testfeature"; - ins1[0].power="testpower"; + adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}}; + adb_query_id_t qid = {0}; + qid.datum = &query; + qid.sequence_length = 1; + qid.sequence_start = 0; + adb_query_parameters_t parms = + {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10}; + adb_query_refine_t refine = {0}; + refine.hopsize = 1; -//expect_clean_error_exit ${AUDIODB} -d testdb -B -F testFeatureList.txt -W testPowerList.txt - if(!audiodb_batchinsert(mydbp,ins1,1)){ - returnval=-1; - }; + adb_query_spec_t spec; + spec.qid = qid; + spec.params = parms; + spec.refine = refine; -//${AUDIODB} -d testdb -P - if(audiodb_power(mydbp)){ - returnval=-1; - }; + adb_query_results_t *results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); -//expect_clean_error_exit ${AUDIODB} -d testdb -B -F testFeatureList.txt - ins1[0].features="testfeature"; - ins1[0].power=NULL; - if(!audiodb_batchinsert(mydbp,ins1,1)){ - returnval=-1; - }; + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//${AUDIODB} -d testdb -B -F testFeatureList.txt -W testPowerList.txt - ins1[0].features="testfeature"; - ins1[0].power="testpower"; - if(audiodb_batchinsert(mydbp,ins1,1)){ - returnval=-1; - }; + spec.qid.datum->data = (double [2]) {0.5, 0}; + spec.params.npoints = 10; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//# sequence queries require L2NORM -//${AUDIODB} -d testdb -L - if(audiodb_l2norm(mydbp)){ - returnval=-1; - }; + spec.params.npoints = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + audiodb_query_free_results(adb, &spec, results); + + /* queries with associated power data */ + spec.qid.datum->data = (double [2]) {0, 0.5}; + spec.qid.datum->power = (double [1]) {-0.5}; + spec.params.npoints = 10; + spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD; + spec.refine.absolute_threshold = -1.4; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); -//# queries without power files should run as before -//echo "query point (0.0,0.5)" -//intstring 2 > testquery -//floatstring 0 0.5 >> testquery - ivals[0]=2; - dvals[0]=-0.0; dvals[1]=0.5; - maketestfile("testquery",ivals,dvals,2); + spec.refine.absolute_threshold = -0.6; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//${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; + spec.refine.absolute_threshold = -0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 0) return 1; + audiodb_query_free_results(adb, &spec, results); - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; + spec.refine.absolute_threshold = 0; + spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD; + spec.refine.relative_threshold = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + result_present_or_fail(results, "testfeature", 2, 0, 1); + audiodb_query_free_results(adb, &spec, results); -//${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; + spec.refine.relative_threshold = 0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 0); + audiodb_query_free_results(adb, &spec, results); - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; + spec.qid.datum->data = (double [2]) {0.5, 0}; + spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD; + spec.refine.absolute_threshold = -1.4; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//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); + spec.refine.absolute_threshold = -0.6; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); + spec.refine.absolute_threshold = -0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 0) return 1; + audiodb_query_free_results(adb, &spec, results); -//${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; + spec.refine.absolute_threshold = 0; + spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD; + spec.refine.relative_threshold = 1; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 2) return 1; + result_present_or_fail(results, "testfeature", 0, 0, 1); + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;}; + spec.refine.relative_threshold = 0.2; + results = audiodb_query_spec(adb, &spec); + if(!results || results->nresults != 1) return 1; + result_present_or_fail(results, "testfeature", 2, 0, 0); + audiodb_query_free_results(adb, &spec, results); -//${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; + audiodb_close(adb); - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;}; - -//# queries with power files might do something different -//echo "query point (0.0,0.5), p=-0.5" -//intstring 2 > testquery -//floatstring 0 0.5 >> testquery - ivals[0]=2; - dvals[0]=0.0; dvals[1]=0.5; - maketestfile("testquery",ivals,dvals,2); - -//intstring 1 > testquerypower -//floatstring -0.5 >> testquerypower - ivals[0]=1; - dvals[0]=-0.5; - maketestfile("testquerypower",ivals,dvals,1); - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-1.4 > testoutput -//echo testfeature 1 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-1.4; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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 -w testquerypower --absolute-threshold=-0.6 > testoutput -//echo testfeature 0 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-0.6; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput -//cat /dev/null > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-0.2; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* check the test values */ - if (size != 0) {returnval = -1;}; - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput -//audioDB -Q sequence -d testdb -f testquery -w testquerypower -l 1 --relative-threshold 1.000000 -//echo testfeature 1 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=0.0; - myadbquery.relative_threshold=1.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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 -w testquerypower --relative-threshold=0.2 > testoutput -//echo testfeature 0 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=0.0; - myadbquery.relative_threshold=0.2; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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), p=-0.5" -////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 -w testquerypower --absolute-threshold=-1.4 > testoutput -//echo testfeature 1 0 1 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-1.4; - myadbquery.relative_threshold=0.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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 -w testquerypower --absolute-threshold=-0.6 > testoutput -//echo testfeature 2 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-0.6; - myadbquery.relative_threshold=0.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",2,0,0)) {returnval = -1;}; - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput -//cat /dev/null > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.absolute_threshold=-0.2; - myadbquery.relative_threshold=0.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* check the test values */ - if (size != 0) {returnval = -1;}; - -//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput -//echo testfeature 1 0 1 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.relative_threshold=1.0; - myadbquery.absolute_threshold=0.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* 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 -w testquerypower --relative-threshold=0.2 > testoutput -//echo testfeature 2 0 0 > test-expected-output -//cmp testoutput test-expected-output - myadbquery.querytype="sequence"; - myadbquery.feature="testquery"; - myadbquery.power="testquerypower"; - myadbquery.sequencelength="1"; - myadbquery.relative_threshold=0.2; - myadbquery.absolute_threshold=0.0; - myadbquery.numpoints=NULL; - audiodb_query(mydbp,&myadbquery,&myadbqueryresult); - size=myadbqueryresult.sizeRlist; - - ///* check the test values */ - if (size != 1) {returnval = -1;}; - if (testoneresult(&myadbqueryresult,0,"testfeature",2,0,0)) {returnval = -1;}; - - - audiodb_close(mydbp); - //fprintf(stderr,"returnval:%d\n",returnval); - - return(returnval); + return 104; } -