diff gengetopt.in @ 280:3be15407e814

Merge sampling branch (-r361:405, though I hope that the branch is now
finished) onto trunk.  API developers take note.

Things still to clear up:
* whether the threshold distance it currently reports bears any relation
  to reality;
* if not, how to bring it a bit more into alignment;
* minor code cleanup issues in sample.cpp;
* incorporating --absolute-threshold handling into sampling;
* writing suitable test cases.

--- a/gengetopt.in	Mon Jun 30 17:38:59 2008 +0000
+++ b/gengetopt.in	Wed Jul 02 14:07:10 2008 +0000
@@ -17,15 +17,21 @@
 option "ntracks" - "capacity of database for tracks" int dependon="NEW" default="20000" optional
 option "datadim" - "dimensionality of stored data" int dependon="NEW" default="9" optional
 
-section "Database Maintenance" sectiondesc="Querying, tweaking and dumping databases."
+section "Database Maintenance" sectiondesc="Tweaking and dumping databases."
 
-option "STATUS" S "output database information to stdout." dependon="database" optional
 option "DUMP"   D "output all entries: index key size." dependon="database" optional
 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
 
+section "Database Information" sectiondesc="Information about databases."
+
+option "STATUS" S "output database information to stdout." dependon="database" optional
+option "SAMPLE" X "sample statistics for database." dependon="database" optional
+option "nsamples" - "number of pairwise samples to take." dependon="SAMPLE" int typestr="number" default="2000" 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
 option "UPDATE"      U "replace inserted vectors associated with key with new input vectors." dependon="features" dependon="key" dependon="database" optional hidden
 option "features" f "binary series of vectors file {int sz:ieee double[][sz]:eof}." string typestr="filename" dependon="database" optional
@@ -39,6 +45,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 +58,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