view libtests/0036/prog1.c @ 405:ef4792df8f93 api-inversion

invert audioDB::insert / audiodb_insert(). Start off by removing audioDB::insertDatum, and essentially reusing it as audiodb_insert. We now ignore the fact that the command-line parsing code has "helpfully" opened a std::ifstream for the times file and an fd for the power file, and simply go ahead and do our own dirty work. We can delete audioDB::insertDatum entirely, but unfortunately we can't delete audioDB::insertPowerData and audioDB::insertTimestamps, because the index and query code respectively use them. Instead, move the two methods closer to their single uses. audiodb_insert() is perhaps not as short and simple as it might have been hoped given the existence of audiodb_insert_datum(); some of that is C and its terribly way of making you pay every time you use dynamic memory; some of it is the fact that the three different files (feature, times, power) each requires slightly different treatment. Hey ho. We can implement audiodb_batchinsert() in terms of audiodb_insert(); the function is pleasingly small. We can't quite use it for audioDB::batchinsert yet, as we have to deal with the O2_FLAG_LARGE_ADB case (which codepath is untested in libtests/). This means that we can delete whole swathes of hideous code from audioDB.cpp, including not just the versions of audiodb_insert() and audiodb_batchinsert() but also an entire audioDB constructor. Yay. (audioDB::unitNormAndInsertL2 has also died a deserved death).
author mas01cr
date Fri, 05 Dec 2008 22:32:49 +0000
parents 25a4d1799c08
children e072aa1611f5
line wrap: on
line source
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <sys/stat.h>
/*
 *  * #define NDEBUG
 *   * */
#include <assert.h>

#include "../../audioDB_API.h"
#include "../test_utils_lib.h"


int main(int argc, char **argv){

    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;


    return 14;

//#! /bin/bash
//
//. ../test-utils.sh
//
//if [ -f testdb ]; then rm -f testdb; fi
//
//${AUDIODB} -d testdb -N
//
//intstring 2 > testfeature01
//floatstring 0 1 >> testfeature01
//floatstring 1 0 >> testfeature01
//intstring 2 > testfeature10
//floatstring 1 0 >> testfeature10
//floatstring 0 1 >> testfeature10
//
//cat > testfeaturefiles <<EOF
//testfeature01
//testfeature10
//EOF
//
//${AUDIODB} -d testdb -B -F testfeaturefiles
//
//# sequence queries require L2NORM
//${AUDIODB} -d testdb -L
//
//echo "query point (0.0,0.5)"
//intstring 2 > testquery
//floatstring 0 0.5 >> testquery
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput
//echo testfeature01 1 > test-expected-output
//echo 0 0 0 >> test-expected-output
//echo 2 0 1 >> test-expected-output
//echo testfeature10 1 >> test-expected-output
//echo 0 0 1 >> test-expected-output
//echo 2 0 0 >> test-expected-output
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput
//echo testfeature01 0 > test-expected-output
//echo 0 0 0 >> test-expected-output
//echo testfeature10 0 >> test-expected-output
//echo 0 0 1 >> test-expected-output
//cmp testoutput test-expected-output
//
//echo "query point (0.5,0.0)"
//intstring 2 > testquery
//floatstring 0.5 0 >> testquery
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput
//echo testfeature01 1 > test-expected-output
//echo 0 0 1 >> test-expected-output
//echo 2 0 0 >> test-expected-output
//echo testfeature10 1 >> test-expected-output
//echo 0 0 0 >> test-expected-output
//echo 2 0 1 >> test-expected-output
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput
//cmp testoutput test-expected-output
//
//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput
//echo testfeature01 0 > test-expected-output
//echo 0 0 1 >> test-expected-output
//echo testfeature10 0 >> test-expected-output
//echo 0 0 0 >> test-expected-output
//cmp testoutput test-expected-output
//
//exit 104

    returnval=-1;
      
    return(returnval);
}