Mercurial > hg > audiodb
changeset 64:128f065fd250
Change the default port for the web services server to 14475 (which is
the low 16 bits of 80011...)
Also, delete the not-automatically-maintained usage messages in
audioDB.cpp and audioDB.h, as keeping them in sync with gengetopt.in is
error-prone. (We automatically generate documentation instead.)
| author | mas01cr |
|---|---|
| date | Wed, 26 Sep 2007 11:29:45 +0000 |
| parents | cee75159c0bc |
| children | 00c3326e8242 |
| files | audioDB.cpp audioDB.h gengetopt.in |
| diffstat | 3 files changed, 1 insertions(+), 168 deletions(-) [+] |
line wrap: on
line diff
--- a/audioDB.cpp Thu Sep 20 14:37:55 2007 +0000 +++ b/audioDB.cpp Wed Sep 26 11:29:45 2007 +0000 @@ -1,98 +1,3 @@ -/* audioDB.cpp - -audioDB version 1.0 - -A feature vector database management system for content-based retrieval. - -Usage: audioDB [OPTIONS]... - - --full-help Print help, including hidden options, and exit - -V, --version Print version and exit - -H, --help print help on audioDB usage and exit. - -v, --verbosity=detail level of detail of operational information. - (default=`1') - -Database Setup: - All database operations require a database argument. - - Database commands are UPPER CASE. Command options are lower case. - - -d, --database=filename database file required by Database commands. - -N, --NEW make a new (initially empty) database. - -S, --STATUS output database information to stdout. - -D, --DUMP output all entries: index key size. - -L, --L2NORM unit norm vectors and norm all future inserts. - -Database Insertion: - The following commands insert feature files, with optional keys and - timestamps. - - -I, --INSERT add feature vectors to an existing database. - -U, --UPDATE replace inserted vectors associated with key - with new input vectors. - -f, --features=filename binary series of vectors file {int sz:ieee - double[][sz]:eof}. - -t, --times=filename list of time points (ascii) for feature vectors. - -k, --key=identifier unique identifier associated with features. - - -B, --BATCHINSERT add feature vectors named in a --featureList - file (with optional keys in a --keyList file) - to the named database. - -F, --featureList=filename text file containing list of binary feature - vector files to process - -T, --timesList=filename text file containing list of ascii --times for - each --features file in --featureList. - -K, --keyList=filename text file containing list of unique identifiers - associated with --features. - -Database Search: - Thse commands control the retrieval behaviour. - - -Q, --QUERY=searchtype content-based search on --database using - --features as a query. Optionally restrict the - search to those tracks identified in a - --keyList. (possible values="point", - "track", "sequence") - -p, --qpoint=position ordinal position of query start point in - --features file. (default=`0') - -e, --exhaustive exhaustive search: iterate through all query - vectors in search. Overrides --qpoint. - (default=off) - -n, --pointnn=numpoints number of point nearest neighbours to use in - retrieval. (default=`10') - -R, --radius=DOUBLE radius search, returns all - points/tracks/sequences inside given radius. - (default=`1.0') - -x, --expandfactor=DOUBLE time compress/expand factor of result length to - query length [1.0 .. 100.0]. (default=`1.1') - -o, --rotate rotate query vectors for rotationally invariant - search. (default=off) - -r, --resultlength=length maximum length of the result list. - (default=`10') - -l, --sequencelength=length length of sequences for sequence search. - (default=`16') - -h, --sequencehop=hop hop size of sequence window for sequence search. - (default=`1') - -Web Services: - These commands enable the database process to establish a connection via the - internet and operate as separate client and server processes. - - -s, --SERVER=port run as standalone web service on named port. - (default=`80011') - -c, --client=hostname:port run as a client using named host service. - - Copyright (C) 2007 Michael Casey, Goldsmiths, University of London - - outputs: - - key1 distance1 qpos1 spos1 - key2 distance2 qpos2 spos2 - ... - keyN distanceN qposN sposN - -*/ - #include "audioDB.h" #define O2_DEBUG
--- a/audioDB.h Thu Sep 20 14:37:55 2007 +0000 +++ b/audioDB.h Wed Sep 26 11:29:45 2007 +0000 @@ -1,75 +1,3 @@ -/* audioDB.h - -audioDB version 1.0 - -An efficient feature-vector database management system (FVDBMS) for -content-based multimedia search and retrieval. - -Usage: audioDB [OPTIONS]... - - --full-help Print help, including hidden options, and exit - -V, --version Print version and exit - -H, --help print help on audioDB usage and exit. - -Database Setup: - These commands require a database argument. - -d, --database=filename database name to be used with database commands - -N, --new make a new database - -S, --status database information - -D, --dump list all tracks: index key size - -Database Insertion: - The following commands process a binary input feature file and optional - associated key. - -I, --insert add feature vectors to an existing database - -f, --features=filename binary series of vectors file - -t, --times=filename list of time points (ascii) for feature vectors - -k, --key=identifier unique identifier associated with features - -Batch Commands: - These batch commands require a list of feature vector filenames in a text - file and optional list of keys in a text file. - -B, --batchinsert add feature vectors named in a featureList file - (with optional keys in a keyList file) to the - named database - -F, --featureList=filename text file containing list of binary feature - vector files to process - -T, --timesList=filename text file containing list of ascii time-point - files for each feature vector file named in - featureList - -K, --keyList=filename text file containing list of unique identifiers - to associate with list of feature files - -Database Search: - Thse commands control the behaviour of retrieval from a named database. - -Q, --query perform a content-based search on the named - database using the named feature vector file - as a query - -q, --qtype=type the type of search (possible values="point", - "track", "sequence" default=`sequence') - -p, --qpoint=position ordinal position of query vector (or start of - sequence) in feature vector input file - (default=`0') - -n, --pointnn=numpoints number of point nearest neighbours to use [per - track in track and sequence mode] - (default=`10') - -r, --resultlength=length maximum length of the result list - (default=`10') - -l, --sequencelength=length length of sequences for sequence search - (default=`16') - -h, --sequencehop=hop hop size of sequence window for sequence search - (default=`1') - -Web Services: - These commands enable the database process to establish a connection via the - internet and operate as separate client and server processes. - -s, --server=port run as standalone web service on named port - (default=`80011') - -c, --client=hostname:port run as a client using named host service - -*/ - - #include <stdio.h> #include <stdlib.h> #include <sys/types.h>
--- a/gengetopt.in Thu Sep 20 14:37:55 2007 +0000 +++ b/gengetopt.in Wed Sep 26 11:29:45 2007 +0000 @@ -73,7 +73,7 @@ option "sequencehop" h "hop size of sequence window for sequence search." int typestr="hop" default="1" dependon="QUERY" optional section "Web Services" sectiondesc="These commands enable the database process to establish a connection via the internet and operate as separate client and server processes.\n" -option "SERVER" s "run as standalone web service on named port." int typestr="port" default="80011" optional +option "SERVER" s "run as standalone web service on named port." int typestr="port" default="14475" optional option "client" c "run as a client using named host service." string typestr="hostname:port" optional