comparison libtests/0028/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.
author mas01cr
date Sat, 10 Jan 2009 16:47:57 +0000
parents 94c18f128ce8
children bcc7a6ddb2c8
comparison
equal deleted inserted replaced
476:a7193678280b 498:342822c2d49a
1 #include <stdio.h> 1 #include "audioDB_API.h"
2 #include <stdlib.h> 2 #include "test_utils_lib.h"
3 #include <string.h>
4 #include <sysexits.h>
5 #include <fcntl.h>
6 #include <dirent.h>
7 #include <unistd.h>
8 #include <sys/stat.h>
9 /*
10 * * #define NDEBUG
11 * * */
12 #include <assert.h>
13 3
14 #include "../../audioDB_API.h" 4 int main(int argc, char **argv) {
15 #include "../test_utils_lib.h" 5 adb_t *adb;
6 adb_insert_t batch[1]={{0}};
16 7
8 clean_remove_db(TESTDB);
9 if(!(adb = audiodb_create(TESTDB,0,0,0)))
10 return 1;
17 11
18 int main(int argc, char **argv){ 12 maketestfile("testfeature", 2, (double[4]){0, 1, 1, 0}, 4);
13 maketestfile("testpower", 1, (double[2]) {-0.5, -1}, 2);
19 14
20 int returnval=0; 15 batch[0].features="testfeature";
21 adb_ptr mydbp={0}; 16 batch[0].power="testpower";
22 int ivals[10]; 17 if(!audiodb_batchinsert(adb, batch, 1))
23 double dvals[10]; 18 return 1;
24 char * databasename="testdb";
25 adb_query_t myadbquery={0};
26 adb_queryresult_t myadbqueryresult={0};
27 int size=0;
28 adb_insert_t ins1[2]={{0},{0}};
29 19
20 if(audiodb_power(adb))
21 return 1;
30 22
31 /* remove old directory */ 23 batch[0].power=NULL;
32 //if [ -f testdb ]; then rm -f testdb; fi 24 if(!audiodb_batchinsert(adb, batch, 1))
33 clean_remove_db(databasename); 25 return 1;
34 26
35 /* create new db */ 27 batch[0].power="testpower";
36 //${AUDIODB} -d testdb -N 28 if(audiodb_batchinsert(adb, batch, 1))
37 mydbp=audiodb_create(databasename,0,0,0); 29 return 1;
38 30
39 //intstring 2 > testfeature 31 if(audiodb_l2norm(adb))
40 //floatstring 0 1 >> testfeature 32 return 1;
41 //floatstring 1 0 >> testfeature
42 ivals[0]=2;
43 dvals[0]=0; dvals[1]=1; dvals[2]=1; dvals[3]=0;
44 maketestfile("testfeature",ivals,dvals,4);
45 33
46 //intstring 1 > testpower 34 adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}};
47 //floatstring -0.5 >> testpower 35 adb_query_id_t qid = {0};
48 //floatstring -1 >> testpower 36 qid.datum = &query;
49 ivals[0]=1; 37 qid.sequence_length = 1;
50 dvals[0]=-0.5; dvals[1]=-1; 38 qid.sequence_start = 0;
51 maketestfile("testpower",ivals,dvals,2); 39 adb_query_parameters_t parms =
40 {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10};
41 adb_query_refine_t refine = {0};
42 refine.hopsize = 1;
52 43
53 //echo testfeature > testFeatureList.txt 44 adb_query_spec_t spec;
54 //echo testpower > testPowerList.txt 45 spec.qid = qid;
55 ins1[0].features="testfeature"; 46 spec.params = parms;
56 ins1[0].power="testpower"; 47 spec.refine = refine;
57 48
58 //expect_clean_error_exit ${AUDIODB} -d testdb -B -F testFeatureList.txt -W testPowerList.txt 49 adb_query_results_t *results = audiodb_query_spec(adb, &spec);
59 if(!audiodb_batchinsert(mydbp,ins1,1)){ 50 if(!results || results->nresults != 2) return 1;
60 returnval=-1; 51 result_present_or_fail(results, "testfeature", 0, 0, 0);
61 }; 52 result_present_or_fail(results, "testfeature", 2, 0, 1);
53 audiodb_query_free_results(adb, &spec, results);
62 54
63 //${AUDIODB} -d testdb -P 55 spec.params.npoints = 1;
64 if(audiodb_power(mydbp)){ 56 results = audiodb_query_spec(adb, &spec);
65 returnval=-1; 57 if(!results || results->nresults != 1) return 1;
66 }; 58 result_present_or_fail(results, "testfeature", 0, 0, 0);
59 audiodb_query_free_results(adb, &spec, results);
67 60
68 //expect_clean_error_exit ${AUDIODB} -d testdb -B -F testFeatureList.txt 61 spec.qid.datum->data = (double [2]) {0.5, 0};
69 ins1[0].features="testfeature"; 62 spec.params.npoints = 10;
70 ins1[0].power=NULL; 63 results = audiodb_query_spec(adb, &spec);
71 if(!audiodb_batchinsert(mydbp,ins1,1)){ 64 if(!results || results->nresults != 2) return 1;
72 returnval=-1; 65 result_present_or_fail(results, "testfeature", 0, 0, 1);
73 }; 66 result_present_or_fail(results, "testfeature", 2, 0, 0);
67 audiodb_query_free_results(adb, &spec, results);
74 68
75 //${AUDIODB} -d testdb -B -F testFeatureList.txt -W testPowerList.txt 69 spec.params.npoints = 1;
76 ins1[0].features="testfeature"; 70 results = audiodb_query_spec(adb, &spec);
77 ins1[0].power="testpower"; 71 if(!results || results->nresults != 1) return 1;
78 if(audiodb_batchinsert(mydbp,ins1,1)){ 72 result_present_or_fail(results, "testfeature", 0, 0, 1);
79 returnval=-1; 73 audiodb_query_free_results(adb, &spec, results);
80 }; 74
75 /* queries with associated power data */
76 spec.qid.datum->data = (double [2]) {0, 0.5};
77 spec.qid.datum->power = (double [1]) {-0.5};
78 spec.params.npoints = 10;
79 spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD;
80 spec.refine.absolute_threshold = -1.4;
81 results = audiodb_query_spec(adb, &spec);
82 if(!results || results->nresults != 2) return 1;
83 result_present_or_fail(results, "testfeature", 0, 0, 0);
84 result_present_or_fail(results, "testfeature", 2, 0, 1);
85 audiodb_query_free_results(adb, &spec, results);
81 86
82 //# sequence queries require L2NORM 87 spec.refine.absolute_threshold = -0.6;
83 //${AUDIODB} -d testdb -L 88 results = audiodb_query_spec(adb, &spec);
84 if(audiodb_l2norm(mydbp)){ 89 if(!results || results->nresults != 1) return 1;
85 returnval=-1; 90 result_present_or_fail(results, "testfeature", 0, 0, 0);
86 }; 91 audiodb_query_free_results(adb, &spec, results);
87 92
88 //# queries without power files should run as before 93 spec.refine.absolute_threshold = -0.2;
89 //echo "query point (0.0,0.5)" 94 results = audiodb_query_spec(adb, &spec);
90 //intstring 2 > testquery 95 if(!results || results->nresults != 0) return 1;
91 //floatstring 0 0.5 >> testquery 96 audiodb_query_free_results(adb, &spec, results);
92 ivals[0]=2;
93 dvals[0]=-0.0; dvals[1]=0.5;
94 maketestfile("testquery",ivals,dvals,2);
95 97
96 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput 98 spec.refine.absolute_threshold = 0;
97 //echo testfeature 1 0 0 > test-expected-output 99 spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD;
98 //cmp testoutput test-expected-output 100 spec.refine.relative_threshold = 1;
99 myadbquery.querytype="sequence"; 101 results = audiodb_query_spec(adb, &spec);
100 myadbquery.feature="testquery"; 102 if(!results || results->nresults != 2) return 1;
101 myadbquery.sequencelength="1"; 103 result_present_or_fail(results, "testfeature", 0, 0, 0);
102 audiodb_query(mydbp,&myadbquery,&myadbqueryresult); 104 result_present_or_fail(results, "testfeature", 2, 0, 1);
103 size=myadbqueryresult.sizeRlist; 105 audiodb_query_free_results(adb, &spec, results);
104 106
105 //dump_query(&myadbquery,&myadbqueryresult); 107 spec.refine.relative_threshold = 0.2;
106 ///* check the test values */ 108 results = audiodb_query_spec(adb, &spec);
107 if (size != 1) {returnval = -1;}; 109 if(!results || results->nresults != 1) return 1;
108 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; 110 result_present_or_fail(results, "testfeature", 0, 0, 0);
111 audiodb_query_free_results(adb, &spec, results);
109 112
110 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput 113 spec.qid.datum->data = (double [2]) {0.5, 0};
111 //echo testfeature 0 0 0 > test-expected-output 114 spec.refine.flags = ADB_REFINE_ABSOLUTE_THRESHOLD;
112 //cmp testoutput test-expected-output 115 spec.refine.absolute_threshold = -1.4;
113 myadbquery.querytype="sequence"; 116 results = audiodb_query_spec(adb, &spec);
114 myadbquery.feature="testquery"; 117 if(!results || results->nresults != 2) return 1;
115 myadbquery.sequencelength="1"; 118 result_present_or_fail(results, "testfeature", 0, 0, 1);
116 myadbquery.numpoints="1"; 119 result_present_or_fail(results, "testfeature", 2, 0, 0);
117 audiodb_query(mydbp,&myadbquery,&myadbqueryresult); 120 audiodb_query_free_results(adb, &spec, results);
118 size=myadbqueryresult.sizeRlist;
119 121
120 //dump_query(&myadbquery,&myadbqueryresult); 122 spec.refine.absolute_threshold = -0.6;
121 ///* check the test values */ 123 results = audiodb_query_spec(adb, &spec);
122 if (size != 1) {returnval = -1;}; 124 if(!results || results->nresults != 1) return 1;
123 if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; 125 result_present_or_fail(results, "testfeature", 2, 0, 0);
126 audiodb_query_free_results(adb, &spec, results);
124 127
125 //echo "query point (0.5,0.0)" 128 spec.refine.absolute_threshold = -0.2;
126 //intstring 2 > testquery 129 results = audiodb_query_spec(adb, &spec);
127 //floatstring 0.5 0 >> testquery 130 if(!results || results->nresults != 0) return 1;
128 ivals[0]=2; 131 audiodb_query_free_results(adb, &spec, results);
129 dvals[0]=0.5; dvals[1]=0.0;
130 maketestfile("testquery",ivals,dvals,2);
131 132
133 spec.refine.absolute_threshold = 0;
134 spec.refine.flags = ADB_REFINE_RELATIVE_THRESHOLD;
135 spec.refine.relative_threshold = 1;
136 results = audiodb_query_spec(adb, &spec);
137 if(!results || results->nresults != 2) return 1;
138 result_present_or_fail(results, "testfeature", 0, 0, 1);
139 result_present_or_fail(results, "testfeature", 2, 0, 0);
140 audiodb_query_free_results(adb, &spec, results);
132 141
133 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput 142 spec.refine.relative_threshold = 0.2;
134 //echo testfeature 1 0 1 > test-expected-output 143 results = audiodb_query_spec(adb, &spec);
135 //cmp testoutput test-expected-output 144 if(!results || results->nresults != 1) return 1;
136 myadbquery.querytype="sequence"; 145 result_present_or_fail(results, "testfeature", 2, 0, 0);
137 myadbquery.feature="testquery"; 146 audiodb_query_free_results(adb, &spec, results);
138 myadbquery.sequencelength="1";
139 myadbquery.numpoints=NULL;
140 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
141 size=myadbqueryresult.sizeRlist;
142 147
143 //dump_query(&myadbquery,&myadbqueryresult); 148 audiodb_close(adb);
144 ///* check the test values */
145 if (size != 1) {returnval = -1;};
146 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;};
147 149
148 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput 150 return 104;
149 //echo testfeature 0 0 1 > test-expected-output
150 //cmp testoutput test-expected-output
151 myadbquery.querytype="sequence";
152 myadbquery.feature="testquery";
153 myadbquery.sequencelength="1";
154 myadbquery.numpoints="1";
155 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
156 size=myadbqueryresult.sizeRlist;
157
158 //dump_query(&myadbquery,&myadbqueryresult);
159 ///* check the test values */
160 if (size != 1) {returnval = -1;};
161 if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;};
162
163 //# queries with power files might do something different
164 //echo "query point (0.0,0.5), p=-0.5"
165 //intstring 2 > testquery
166 //floatstring 0 0.5 >> testquery
167 ivals[0]=2;
168 dvals[0]=0.0; dvals[1]=0.5;
169 maketestfile("testquery",ivals,dvals,2);
170
171 //intstring 1 > testquerypower
172 //floatstring -0.5 >> testquerypower
173 ivals[0]=1;
174 dvals[0]=-0.5;
175 maketestfile("testquerypower",ivals,dvals,1);
176
177 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-1.4 > testoutput
178 //echo testfeature 1 0 0 > test-expected-output
179 //cmp testoutput test-expected-output
180 myadbquery.querytype="sequence";
181 myadbquery.feature="testquery";
182 myadbquery.power="testquerypower";
183 myadbquery.sequencelength="1";
184 myadbquery.absolute_threshold=-1.4;
185 myadbquery.numpoints=NULL;
186 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
187 size=myadbqueryresult.sizeRlist;
188
189 ///* check the test values */
190 if (size != 1) {returnval = -1;};
191 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
192
193 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.6 > testoutput
194 //echo testfeature 0 0 0 > test-expected-output
195 //cmp testoutput test-expected-output
196 myadbquery.querytype="sequence";
197 myadbquery.feature="testquery";
198 myadbquery.power="testquerypower";
199 myadbquery.sequencelength="1";
200 myadbquery.absolute_threshold=-0.6;
201 myadbquery.numpoints=NULL;
202 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
203 size=myadbqueryresult.sizeRlist;
204
205 //dump_query(&myadbquery,&myadbqueryresult);
206 ///* check the test values */
207 if (size != 1) {returnval = -1;};
208 if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;};
209
210 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput
211 //cat /dev/null > test-expected-output
212 //cmp testoutput test-expected-output
213 myadbquery.querytype="sequence";
214 myadbquery.feature="testquery";
215 myadbquery.power="testquerypower";
216 myadbquery.sequencelength="1";
217 myadbquery.absolute_threshold=-0.2;
218 myadbquery.numpoints=NULL;
219 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
220 size=myadbqueryresult.sizeRlist;
221
222 //dump_query(&myadbquery,&myadbqueryresult);
223 ///* check the test values */
224 if (size != 0) {returnval = -1;};
225
226 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput
227 //audioDB -Q sequence -d testdb -f testquery -w testquerypower -l 1 --relative-threshold 1.000000
228 //echo testfeature 1 0 0 > test-expected-output
229 //cmp testoutput test-expected-output
230 myadbquery.querytype="sequence";
231 myadbquery.feature="testquery";
232 myadbquery.power="testquerypower";
233 myadbquery.sequencelength="1";
234 myadbquery.absolute_threshold=0.0;
235 myadbquery.relative_threshold=1.0;
236 myadbquery.numpoints=NULL;
237 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
238 size=myadbqueryresult.sizeRlist;
239
240 //dump_query(&myadbquery,&myadbqueryresult);
241 ///* check the test values */
242 if (size != 1) {returnval = -1;};
243 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
244
245 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=0.2 > testoutput
246 //echo testfeature 0 0 0 > test-expected-output
247 //cmp testoutput test-expected-output
248 myadbquery.querytype="sequence";
249 myadbquery.feature="testquery";
250 myadbquery.power="testquerypower";
251 myadbquery.sequencelength="1";
252 myadbquery.absolute_threshold=0.0;
253 myadbquery.relative_threshold=0.2;
254 myadbquery.numpoints=NULL;
255 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
256 size=myadbqueryresult.sizeRlist;
257
258 //dump_query(&myadbquery,&myadbqueryresult);
259 ///* check the test values */
260 if (size != 1) {returnval = -1;};
261 if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;};
262
263 ////echo "query point (0.5,0.0), p=-0.5"
264 ////intstring 2 > testquery
265 ////floatstring 0.5 0 >> testquery
266 ivals[0]=2;
267 dvals[0]=0.5; dvals[1]=0.0;
268 maketestfile("testquery",ivals,dvals,2);
269
270 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-1.4 > testoutput
271 //echo testfeature 1 0 1 > test-expected-output
272 //cmp testoutput test-expected-output
273 myadbquery.querytype="sequence";
274 myadbquery.feature="testquery";
275 myadbquery.power="testquerypower";
276 myadbquery.sequencelength="1";
277 myadbquery.absolute_threshold=-1.4;
278 myadbquery.relative_threshold=0.0;
279 myadbquery.numpoints=NULL;
280 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
281 size=myadbqueryresult.sizeRlist;
282
283 // dump_query(&myadbquery,&myadbqueryresult);
284 ///* check the test values */
285 if (size != 1) {returnval = -1;};
286 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;};
287
288 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.6 > testoutput
289 //echo testfeature 2 0 0 > test-expected-output
290 //cmp testoutput test-expected-output
291 myadbquery.querytype="sequence";
292 myadbquery.feature="testquery";
293 myadbquery.power="testquerypower";
294 myadbquery.sequencelength="1";
295 myadbquery.absolute_threshold=-0.6;
296 myadbquery.relative_threshold=0.0;
297 myadbquery.numpoints=NULL;
298 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
299 size=myadbqueryresult.sizeRlist;
300
301 //dump_query(&myadbquery,&myadbqueryresult);
302 ///* check the test values */
303 if (size != 1) {returnval = -1;};
304 if (testoneresult(&myadbqueryresult,0,"testfeature",2,0,0)) {returnval = -1;};
305
306 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --absolute-threshold=-0.2 > testoutput
307 //cat /dev/null > test-expected-output
308 //cmp testoutput test-expected-output
309 myadbquery.querytype="sequence";
310 myadbquery.feature="testquery";
311 myadbquery.power="testquerypower";
312 myadbquery.sequencelength="1";
313 myadbquery.absolute_threshold=-0.2;
314 myadbquery.relative_threshold=0.0;
315 myadbquery.numpoints=NULL;
316 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
317 size=myadbqueryresult.sizeRlist;
318
319 //dump_query(&myadbquery,&myadbqueryresult);
320 ///* check the test values */
321 if (size != 0) {returnval = -1;};
322
323 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=1 > testoutput
324 //echo testfeature 1 0 1 > test-expected-output
325 //cmp testoutput test-expected-output
326 myadbquery.querytype="sequence";
327 myadbquery.feature="testquery";
328 myadbquery.power="testquerypower";
329 myadbquery.sequencelength="1";
330 myadbquery.relative_threshold=1.0;
331 myadbquery.absolute_threshold=0.0;
332 myadbquery.numpoints=NULL;
333 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
334 size=myadbqueryresult.sizeRlist;
335
336 //dump_query(&myadbquery,&myadbqueryresult);
337 ///* check the test values */
338 if (size != 1) {returnval = -1;};
339 if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;};
340
341 //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -w testquerypower --relative-threshold=0.2 > testoutput
342 //echo testfeature 2 0 0 > test-expected-output
343 //cmp testoutput test-expected-output
344 myadbquery.querytype="sequence";
345 myadbquery.feature="testquery";
346 myadbquery.power="testquerypower";
347 myadbquery.sequencelength="1";
348 myadbquery.relative_threshold=0.2;
349 myadbquery.absolute_threshold=0.0;
350 myadbquery.numpoints=NULL;
351 audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
352 size=myadbqueryresult.sizeRlist;
353
354 ///* check the test values */
355 if (size != 1) {returnval = -1;};
356 if (testoneresult(&myadbqueryresult,0,"testfeature",2,0,0)) {returnval = -1;};
357
358
359 audiodb_close(mydbp);
360 //fprintf(stderr,"returnval:%d\n",returnval);
361
362 return(returnval);
363 } 151 }
364