comparison audioDB.h @ 23:42498552b30c audiodb-debian

Merged trunk changes -r30:38 onto audiodb-debian branch

 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 segments: index key size
+  -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

   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", 
-                                 "segment", "sequence" default=`sequence')
+                                 "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 
-                                 segment in segment and sequence mode]  
+                                 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')

 #define COM_DATABASE "--database"
 #define COM_QTYPE "--qtype"
 #define COM_SEQLEN "--sequencelength"
 #define COM_SEQHOP "--sequencehop"
 #define COM_POINTNN "--pointnn"
-#define COM_SEGNN "--resultlength"
+#define COM_TRACKNN "--resultlength"
 #define COM_QPOINT "--qpoint"
 #define COM_FEATURES "--features"
 #define COM_QUERYKEY "--key"
 #define COM_KEYLIST "--keyList"
 #define COM_TIMES "--times"
 
 #define O2_MAGIC 1111765583 // 'B'<<24|'D'<<16|'2'<<8|'O' reads O2DB in little endian order
 
 #define O2_DEFAULT_POINTNN (10U)
-#define O2_DEFAULT_SEGNN  (10U)
+#define O2_DEFAULT_TRACKNN  (10U)
 
 #define O2_DEFAULTDBSIZE (2000000000) // 2GB table size
 //#define O2_DEFAULTDBSIZE (1000000000U) // 1GB table size
 
 //#define O2_MAXFILES (1000000)
 #define O2_MAXFILES (10000U)           // 10,000 files
 #define O2_MAXFILESTR (256U)
 #define O2_FILETABLESIZE (O2_MAXFILESTR)
-#define O2_SEGTABLESIZE (sizeof(unsigned))
+#define O2_TRACKTABLESIZE (sizeof(unsigned))
 #define O2_HEADERSIZE (sizeof(dbTableHeaderT))
 #define O2_MEANNUMVECTORS (1000U)
 #define O2_MAXDIM (1000U)
-#define O2_MAXNN (1000U)
+#define O2_MAXNN (10000U)
 
 // Flags
 #define O2_FLAG_L2NORM (0x1U)
 #define O2_FLAG_MINMAX (0x2U)
 #define O2_FLAG_POINT_QUERY (0x4U)
 #define O2_FLAG_SEQUENCE_QUERY (0x8U)
-#define O2_FLAG_SEG_QUERY (0x10U)
+#define O2_FLAG_TRACK_QUERY (0x10U)
 #define O2_FLAG_TIMES (0x20U)
 
 // Error Codes
 #define O2_ERR_KEYNOTFOUND (0xFFFFFF00)
 

   unsigned dim;
   const char *dbName;
   const char *inFile;
   const char *hostport;
   const char *key;
-  const char* segFileName;
-  ifstream *segFile;
+  const char* trackFileName;
+  ifstream *trackFile;
   const char *command;
   const char *timesFileName;
   ifstream *timesFile;
 
   int dbfid;

   char* db;
   char* indata;
   struct stat statbuf;  
   dbTableHeaderPtr dbH;
   size_t fileTableOffset;
-  size_t segTableOffset;
+  size_t trackTableOffset;
   size_t dataoffset;
   size_t l2normTableOffset;
   size_t timesTableOffset;
   
   char *fileTable;
-  unsigned* segTable;
+  unsigned* trackTable;
   double* dataBuf;
   double* inBuf;
   double* l2normTable;
   double* qNorm;
   double* sNorm;

 
   // Flags and parameters
   unsigned verbosity;   // how much do we want to know?
   unsigned queryType; // point queries default
   unsigned pointNN;   // how many point NNs ?
-  unsigned segNN;   // how many seg NNs ?
+  unsigned trackNN;   // how many track NNs ?
   unsigned sequenceLength;
   unsigned sequenceHop;
   unsigned queryPoint;
   unsigned usingQueryPoint;
   unsigned usingTimes;
   unsigned isClient;
   unsigned isServer;
   unsigned port;
   double timesTol;
-  unsigned ignoreCols;
-
+  double radius;
+  
   // Timers
   struct timeval tv1;
   struct timeval tv2;
     
-
-  
-
   // private methods
   void error(const char* a, const char* b = "");
   void pointQuery(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
-  void sequenceQuery(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
-  void segPointQuery(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
-  void segSequenceQuery(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
+  void trackPointQuery(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
+  void trackSequenceQueryNN(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
+  void trackSequenceQueryRad(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
 
   void initTables(const char* dbName, const char* inFile);
-  void NBestMatchedFilter();
   void unitNorm(double* X, unsigned d, unsigned n, double* qNorm);
   void unitNormAndInsertL2(double* X, unsigned dim, unsigned n, unsigned append);
   void normalize(double* X, int dim, int n);
   void normalize(double* X, int dim, int n, double minval, double maxval);
   void insertTimeStamps(unsigned n, ifstream* timesFile, double* timesdata);

   void insert(const char* dbName, const char* inFile);
   void batchinsert(const char* dbName, const char* inFile);
   void query(const char* dbName, const char* inFile, adb__queryResult *adbQueryResult=0);
   void status(const char* dbName);
   void ws_status(const char*dbName, char* hostport);
-  void ws_query(const char*dbName, const char *segKey, const char* hostport);
+  void ws_query(const char*dbName, const char *trackKey, const char* hostport);
   void l2norm(const char* dbName);
   void dump(const char* dbName);
-  void deleteDB(const char* dbName, const char* inFile);
 
   // web services
   void startServer();
   
 };
+