changeset 258:d12364d8b9ea adding-emd

added cmdline stubs for distance switch and skeleton methods for EMD

--- a/audioDB.h	Mon Apr 14 15:36:29 2008 +0000
+++ b/audioDB.h	Fri Apr 25 17:40:19 2008 +0000
@@ -78,6 +78,9 @@
 #define O2_TRACK_QUERY (0x10U)
 #define O2_N_SEQUENCE_QUERY (0x20U)
 
+// Distance types
+#define EUCLIDEAN (0x1U)
+#define EARTHMOVERS (0x2U)
 
 // Error Codes
 #define O2_ERR_KEYNOTFOUND (0xFFFFFF00)
@@ -172,6 +175,7 @@
   unsigned verbosity;   // how much do we want to know?
   off_t size; // given size (for creation)
   unsigned queryType; // point queries default
+  unsigned distType;  // euclidean default, added to allow EMD switch
   unsigned pointNN;   // how many point NNs ?
   unsigned trackNN;   // how many track NNs ?
   unsigned sequenceLength;
@@ -283,6 +287,7 @@
   verbosity(1), \
   size(O2_DEFAULTDBSIZE), \
   queryType(O2_POINT_QUERY), \
+  distType(EUCLIDEAN), \
   pointNN(O2_DEFAULT_POINTNN), \
   trackNN(O2_DEFAULT_TRACKNN), \
   sequenceLength(16), \

--- a/gengetopt.in	Mon Apr 14 15:36:29 2008 +0000
+++ b/gengetopt.in	Fri Apr 25 17:40:19 2008 +0000
@@ -1,5 +1,5 @@
 package "audioDB"
-version "version 0.8.preview"
+version "version 0.8.preview with EMD"
 purpose "A feature vector database management system for content-based retrieval."
 option "help" H "print help on audioDB usage and exit." optional
 option "verbosity" v "level of detail of operational information." int typestr="detail" default="1" optional
@@ -36,6 +36,7 @@
 option "QUERY" Q "content-based search on --database using --features as a query. Optionally restrict the search to those tracks identified in a --keyList." values="point","track","sequence", "nsequence" typestr="searchtype" dependon="database" dependon="features" optional
 option "qpoint" p "ordinal position of query start point in --features file." int typestr="position" default="0" optional
 option "exhaustive" e "exhaustive search: iterate through all query vectors in search. Overrides --qpoint." flag off optional hidden
+option "earthMovers" E "earthMoversDistance: use earth movers distance as vector to vector distance metric rather than euclidean like metrics.  EXPERIMENTAL  -- only intended for use with statistical summary vectors (GMMs for instance)" flag off optional hidden
 option "pointnn" n "number of point nearest neighbours to use in retrieval." int typestr="numpoints" default="10" optional
 option "radius"  R "radius search, returns all points/tracks/sequences inside given radius. (Overrides --pointnn)." double default="1.0" optional 
 option "expandfactor" x "time compress/expand factor of result length to query length [1.0 .. 100.0]." double default="1.1" optional hidden