comparison libtests/0006/prog1.c @ 490:13de7ba21966 api-inversion

Continue removing uses of audiodb_query()

Deal with four more libtests/ cases.

Of course, it would probably be "nice" or "useful" to provide an
audiodb_query() implemented in terms of audiodb_query_spec() -- but that
is not a task that I would enjoy.

 #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}};
+  if(audiodb_insert_datum(adb, &feature))
+    return 1;
+  audiodb_l2norm(adb);
 
+  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;
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-    /* create new db */
-    //${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
+  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);
 
-    /* create testfeature file */
-    //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);
+  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);
 
+  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);
 
-    /* insert */
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    if(audiodb_insert(mydbp,&myinsert)){
-        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);
 
+  audiodb_close(adb);
 
-    /* turn on L2NORM */
-    //# sequence queries require L2NORM
-    //${AUDIODB} -d testdb -L
-    audiodb_l2norm(mydbp);
-
-    /* make a test query */
-    //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; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,2);
-
-    /* test a sequence query */
-    //${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;};
-
-
-    /* same but with limites */
-    //${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.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;};
-
-    /* make another query */
-    //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; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,2);
-
-
-    /* test new query */
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-    //echo testfeature 1 0 1 > 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;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",1,0,1)) {returnval = -1;};
-
-
-    /* test new query with limits */    
-    myadbquery2.numpoints="1"; 
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-    //${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
-
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",0,0,1)) {returnval = -1;};
-
-
-
-    /* close */
-    audiodb_close(mydbp);
-
-    printf("returnval:%d\n",returnval);
-    return(returnval);
+  return(104);
 }
-
-