comparison audioDB.h @ 258:d12364d8b9ea adding-emd

added cmdline stubs for distance switch and skeleton methods for EMD

 #define O2_POINT_QUERY (0x4U)
 #define O2_SEQUENCE_QUERY (0x8U)
 #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)
 
 // Macros

 
   // Flags and parameters
   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;
   unsigned sequenceHop;
   bool normalizedDistance;

   powerTableLength(0), \
   l2normTableLength(0), \
   verbosity(1), \
   size(O2_DEFAULTDBSIZE), \
   queryType(O2_POINT_QUERY), \
+  distType(EUCLIDEAN), \
   pointNN(O2_DEFAULT_POINTNN), \
   trackNN(O2_DEFAULT_TRACKNN), \
   sequenceLength(16), \
   sequenceHop(1), \
   normalizedDistance(true), \