view audioDBws.h @ 264:1cec738101a8 0.8.9.anteindex

Fixed trackSequenceQueryNNReporter and trackSequenceQueryRadNNReporter so that order of point reporting is
what you would expect: i.e. closest to farthest.

pointNN is set to allow a maximum (MAX_POINTNN) of 1000000 points. This allows computation of an S-Matrix
using -Q nsequence. It also enables using the new -Q onetoonensequence query type for concatenative
synthesis by finding the closest match in the entire database to each query point. Restrict lists (-K
rList.txt) are useful for limiting the search to specific items in the database in these two cases.

-This line, and those below, will be ignored--

M    trunk/reporter.h

// audioDBws.h -- web services interface to audioDB
//
//FIXME: this hard-coding of the service location might be right for
//its internal use at Goldsmiths (for now) but really isn't in
//general.  Find a way to bind this later (at install time?  Or maybe
//just require that the installer edit the resulting wsdl file?)
//
//gsoap adb service location: http://gibbons.doc.gold.ac.uk:20703/

typedef int xsd__int;
typedef double xsd__double;
typedef char* xsd__string;

// Supports result lists of arbitrary length
struct adb__queryResult{
  int __sizeRlist;
  char **Rlist; // Maximum size of result list
  int __sizeDist;  
  double *Dist;
  int __sizeQpos;  
  unsigned int *Qpos;
  int __sizeSpos;
  unsigned int *Spos;
};

struct adb__statusResult {
  unsigned numFiles;
  unsigned dim;
  unsigned length;
  unsigned dudCount;
  unsigned nullCount;
  unsigned flags;
};

struct adb__statusResponse {
  struct adb__statusResult result;
};

struct adb__queryResponse {
  struct adb__queryResult result;
};

// Print the status of an existing adb database
int adb__status(xsd__string dbName, struct adb__statusResponse &adbStatusResponse);

// Query an existing adb database
int adb__query(xsd__string dbName, xsd__string qKey, xsd__string keyList, xsd__string timesFileName, xsd__int qType, xsd__int qPos, xsd__int pointNN, xsd__int segNN, xsd__int segLen, struct adb__queryResponse &adbQueryResponse);

struct adb__sequenceQueryParms {
  xsd__string keyList;
  xsd__string timesFileName;
  xsd__string powerFileName;
  xsd__int qPos;
  xsd__int pointNN;
  xsd__int segNN;
  xsd__int segLen;
  xsd__double relative_threshold;
  xsd__double absolute_threshold;
};

// Perform a sequence query
int adb__sequenceQuery(xsd__string dbName, xsd__string qKey, 
		       struct adb__sequenceQueryParms *parms, 
		       struct adb__queryResponse &adbQueryResponse);