Mercurial > hg > audiodb
changeset 266:4ffa05f25a00 sampling
Add initial sampling of database distances. Zillions of FIXME comments
everywhere.
author | mas01cr |
---|---|
date | Sat, 14 Jun 2008 17:13:26 +0000 |
parents | 235762857a70 |
children | 40a93d5d462c |
files | Makefile audioDB.cpp audioDB.h gengetopt.in sample.cpp |
diffstat | 5 files changed, 136 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jun 14 17:12:04 2008 +0000 +++ b/Makefile Sat Jun 14 17:13:26 2008 +0000 @@ -37,7 +37,7 @@ %.o: %.cpp audioDB.h adb.nsmap cmdline.h reporter.h g++ -c ${CFLAGS} ${GSOAP_INCLUDE} -Wall -Werror $< -OBJS=insert.o create.o common.o dump.o query.o soap.o audioDB.o +OBJS=insert.o create.o common.o dump.o query.o soap.o sample.o audioDB.o ${EXECUTABLE}: ${OBJS} soapServer.cpp soapClient.cpp soapC.cpp cmdline.c g++ -o ${EXECUTABLE} ${CFLAGS} ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
--- a/audioDB.cpp Sat Jun 14 17:12:04 2008 +0000 +++ b/audioDB.cpp Sat Jun 14 17:13:26 2008 +0000 @@ -37,6 +37,9 @@ ws_status(dbName,(char*)hostport); else status(dbName); + + else if(O2_ACTION(COM_SAMPLE)) + sample(dbName); else if(O2_ACTION(COM_L2NORM)) l2norm(dbName); @@ -210,6 +213,12 @@ return 0; } + if(args_info.SAMPLE_given) { + command = COM_SAMPLE; + dbName = args_info.database_arg; + return 0; + } + if(args_info.DUMP_given){ command=COM_DUMP; dbName=args_info.database_arg;
--- a/audioDB.h Sat Jun 14 17:12:04 2008 +0000 +++ b/audioDB.h Sat Jun 14 17:13:26 2008 +0000 @@ -29,6 +29,7 @@ #define COM_POWER "--POWER" #define COM_DUMP "--DUMP" #define COM_SERVER "--SERVER" +#define COM_SAMPLE "--SAMPLE" // parameters #define COM_CLIENT "--client" @@ -247,6 +248,8 @@ void batchinsert(const char* dbName, const char* inFile); void query(const char* dbName, const char* inFile, adb__queryResponse *adbQueryResponse=0); void status(const char* dbName, adb__statusResponse *adbStatusResponse=0); + unsigned random_track(unsigned *propTable, unsigned total); + void sample(const char *dbName); void ws_status(const char*dbName, char* hostport); void ws_query(const char*dbName, const char *trackKey, const char* hostport); void l2norm(const char* dbName);
--- a/gengetopt.in Sat Jun 14 17:12:04 2008 +0000 +++ b/gengetopt.in Sat Jun 14 17:13:26 2008 +0000 @@ -24,6 +24,7 @@ option "output" - "output directory" string dependon="DUMP" default="audioDB.dump" optional option "L2NORM" L "unit norm vectors and norm all future inserts." dependon="database" optional option "POWER" P "turn on power flag for database." dependon="database" optional +option "SAMPLE" X "sample statistics for database." dependon="database" optional section "Database Insertion" sectiondesc="The following commands insert feature files, with optional keys and timestamps.\n" option "INSERT" I "add feature vectors to an existing database." dependon="features" optional @@ -39,6 +40,8 @@ option "powerList" W "text file containing list of binary power feature file." string typestr="filename" dependon="database" optional option "keyList" K "text file containing list of unique identifiers associated with --features." string typestr="filename" optional +option "sequencelength" l "length of sequences for sequence search." int typestr="length" default="16" optional + section "Database Search" sectiondesc="Thse commands control the retrieval behaviour.\n" @@ -50,7 +53,6 @@ option "expandfactor" x "time compress/expand factor of result length to query length [1.0 .. 100.0]." double default="1.1" optional hidden option "rotate" o "rotate query vectors for rotationally invariant search." flag off optional hidden option "resultlength" r "maximum length of the result list." int typestr="length" default="10" optional -option "sequencelength" l "length of sequences for sequence search." int typestr="length" default="16" dependon="QUERY" optional option "sequencehop" h "hop size of sequence window for sequence search." int typestr="hop" default="1" dependon="QUERY" optional option "absolute-threshold" - "absolute power threshold for consideration of query or target sequence (in Bels)" double dependon="QUERY" optional option "relative-threshold" - "relative power threshold between query and target sequence (in Bels)" double dependon="QUERY" optional
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample.cpp Sat Jun 14 17:13:26 2008 +0000 @@ -0,0 +1,120 @@ +#include "audioDB.h" + +unsigned audioDB::random_track(unsigned *propTable, unsigned total) { + /* FIXME: make this O(1) by using the alias-rejection method, or + some other sensible method of sampling from a discrete + distribution. */ + /* FIXME: use a real random number generator, not random() */ + double thing = random() / (double) RAND_MAX; + unsigned sofar = 0; + for (unsigned int i = 0; i < dbH->numFiles; i++) { + sofar += propTable[i]; + if (thing < ((double) sofar / (double) total)) { + return i; + } + } + error("fell through in random_track()"); + + /* FIXME: decorate error's declaration so that this isn't necessary */ + return 0; +} + +void audioDB::sample(const char *dbName) { + initTables(dbName, 0); + + // build track offset table (FIXME: cut'n'pasted from query.cpp) + off_t *trackOffsetTable = new off_t[dbH->numFiles]; + unsigned cumTrack=0; + for(unsigned int k = 0; k < dbH->numFiles; k++){ + trackOffsetTable[k] = cumTrack; + cumTrack += trackTable[k] * dbH->dim; + } + + unsigned *propTable = new unsigned[dbH->numFiles]; + unsigned total = 0; + + for (unsigned int i = 0; i < dbH->numFiles; i++) { + /* what kind of a stupid language doesn't have binary max(), let + alone nary? */ + unsigned int prop = trackTable[i] - sequenceLength + 1; + prop = prop > 0 ? prop : 0; + propTable[i] = prop; + total += prop; + } + + if (total == 0) { + error("no sequences of this sequence length in the database", dbName); + } + + unsigned int vlen = dbH->dim * sequenceLength; + double *v1 = new double[vlen]; + double *v2 = new double[vlen]; + double v1norm, v2norm, v1v2; + + double sumdist = 0; + double sumlogdist = 0; + + /* 1037 samples for now */ + for (unsigned int i = 0; i < 1037;) { + /* FIXME: in Real Life we'll want to initialize the RNG using + /dev/random or the current time or something. */ + unsigned track1 = random_track(propTable, total); + unsigned track2 = random_track(propTable, total); + + /* FIXME: this uses lower-order bits, which is OK on Linux but not + necessarily elsewhere. Again, use a real random number + generator */ + unsigned i1 = random() % propTable[track1]; + unsigned i2 = random() % propTable[track2]; + + VERB_LOG(1, "%d %d, %d %d | ", track1, i1, track2, i2); + + /* FIXME: this seeking, reading and distance calculation should + share more code with the query loop */ + lseek(dbfid, dbH->dataOffset + trackOffsetTable[track1] * sizeof(double) + i1 * dbH->dim * sizeof(double), SEEK_SET); + read(dbfid, v1, dbH->dim * sequenceLength * sizeof(double)); + + lseek(dbfid, dbH->dataOffset + trackOffsetTable[track2] * sizeof(double) + i2 * dbH->dim * sizeof(double), SEEK_SET); + read(dbfid, v2, dbH->dim * sequenceLength * sizeof(double)); + + v1norm = 0; + v2norm = 0; + v1v2 = 0; + + for (unsigned int j = 0; j < vlen; j++) { + v1norm += v1[j]*v1[j]; + v2norm += v2[j]*v2[j]; + v1v2 += v1[j]*v2[j]; + } + + /* FIXME: we must deal with infinities better than this; there + could be all sorts of NaNs from arbitrary features. Best + include power thresholds or something... */ + if(isfinite(v1norm) && isfinite(v2norm) && isfinite(v1v2)) { + + VERB_LOG(1, "%f %f %f | ", v1norm, v2norm, v1v2); + /* assume normalizedDistance == true for now */ + /* FIXME: not convinced that the statistics we calculated in + TASLP paper are valid for normalizedDistance */ + double dist = 2 - v1v2 / sqrt(v1norm * v2norm); + VERB_LOG(1, "%f %f\n", dist, log(dist)); + sumdist += dist; + sumlogdist += log(dist); + i++; + } else { + VERB_LOG(1, "infinity found: %f %f %f\n", v1norm, v2norm, v1v2); + } + } + + std::cout << "Summary statistics" << std::endl; + std::cout << "number of samples: " << 1037 << std::endl; + std::cout << "sum of distances (S): " << sumdist << std::endl; + std::cout << "sum of log distances (L): " << sumlogdist << std::endl; + + /* FIXME: we'll also want some summary statistics based on + propTable, for the minimum-of-X estimate */ + + delete[] propTable; + delete[] v1; + delete[] v2; +}