diff libtests/0024/prog1.c @ 498:342822c2d49a

Merge api-inversion branch (-r656:771, but I don't expect to return to
that branch) into the trunk.

I expect there to be minor performance regressions (e.g. in the SOAP
server index cacheing, which I have forcibly removed) and minor
unplugged memory leaks (e.g. in audioDB::query(), where I don't free up
the datum).  I hope that these leaks and performance regressions can be
plugged in short order.  I also expect that some (but maybe not all) of
the issues currently addressed in the memory-leaks branch are superseded
or fixed by this merge.

There remains much work to be done; go forth and do it.

--- a/libtests/0024/prog1.c	Sat Jan 10 11:11:27 2009 +0000
+++ b/libtests/0024/prog1.c	Sat Jan 10 16:47:57 2009 +0000
@@ -1,118 +1,55 @@
-#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"
 
-#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}};
 
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
 
-int main(int argc, char **argv){
+  maketestfile("testfeature01", 2, (double[2]) {0, 1}, 2);
+  maketestfile("testfeature10", 2, (double[2]) {1, 0}, 2);
 
-    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};
+  batch[0].features="testfeature01";
+  batch[1].features="testfeature10";
+  if(audiodb_batchinsert(adb, batch, 2))
+    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 = {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;
 
-    /* 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;
+  
+  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);
 
-//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);
+  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);
 
-//cat > testfeaturefiles <<EOF
-//testfeature01
-//testfeature10
-//EOF
-    ins1[0].features="testfeature01";
-    ins1[1].features="testfeature10";
+  audiodb_close(adb);
 
-
-//${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);
-    //dump_query(&myadbquery,&myadbqueryresult);
-    ///* 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);
-    //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",0,1,0)) {returnval = -1;};
-
-      
-    printf("returnval:%d\n",returnval);
-    return(returnval);
+  return 104;
 }
-