comparison soap.cpp @ 471:add65705e655

added --no_unit_norming to SOAP interface, added this case to tests/0041

 			  (char *)featureFileName, (char *)trackFileName,
 			  (char *)timesFileName, (char *) powerFileName,
 			  queryType, queryPoint, 
 			  pointNN, trackNN, sequenceLength, 
 			  radius, absolute_threshold, relative_threshold,
-			  !usingQueryPoint, lsh_exact,
+			  !usingQueryPoint, lsh_exact, no_unit_norming,
 			  adbQueryResponse) 
      == SOAP_OK) {
     if(radius == 0) {
       for(int i=0; i<adbQueryResponse.result.__sizeRlist; i++) {
 	std::cout << adbQueryResponse.result.Rlist[i] << " "

 					 trackNN,
 					 sequenceLength,
 					 radius,
 					 absolute_threshold,
 					 usingQueryPoint,
-					   lsh_exact,
+					 lsh_exact,
+					 no_unit_norming,
 					 adbQueryResponse)==SOAP_OK){
       //std::std::cerr << "result list length:" << adbQueryResponse.result.__sizeRlist << std::std::endl;
       for(int i=0; i<adbQueryResponse.result.__sizeRlist; i++)
 	std::cout << adbQueryResponse.result.Rlist[i] << " " << adbQueryResponse.result.Dist[i] 
 		  << " " << adbQueryResponse.result.Qpos[i] << " " << adbQueryResponse.result.Spos[i] << std::endl;

 	       xsd__int qType, 
 	       xsd__int qPos, xsd__int pointNN, xsd__int trackNN, 
 	       xsd__int seqLen,
 	       xsd__double radius, 
 	       xsd__double absolute_threshold, xsd__double relative_threshold,
-	       xsd__int exhaustive, xsd__int lsh_exact,
+	       xsd__int exhaustive, xsd__int lsh_exact, xsd__int no_unit_norming,
 	       adb__queryResponse &adbQueryResponse){
   char queryType[256];
 
   fprintf(stderr,"Calling fileName query on database %s with featureFile=%s\n", dbName, qKey);
 

   }
   if (exhaustive) {
     argc++;
   }
   if (lsh_exact) {
+    argc++;
+  }
+
+  if(no_unit_norming){
     argc++;
   }
 
   const char **argv = new const char*[argc+1];
   argv[0] = "./audioDB";

     argv[argv_counter++] = COM_EXHAUSTIVE;
   }
   if (lsh_exact) {
     argv[argv_counter++] = COM_LSH_EXACT;
   }
+
+  if (no_unit_norming) {
+    argv[argv_counter++] = COM_NO_UNIT_NORMING;
+  }
+
   argv[argv_counter] = NULL;
 
   try {
     audioDB(argc, argv, &adbQueryResponse);
     delete [] argv;

 			    xsd__int trackNN,
 			    xsd__int sequenceLength,
 			    xsd__double radius,
 			    xsd__double absolute_threshold,
 			    xsd__int usingQueryPoint,
-			    xsd__int lsh_exact,
+			    xsd__int lsh_exact, xsd__int no_unit_norming,
 			    struct adb__queryResponse& adbQueryResponse){
   char qtypeStr[256];
 
-  fprintf(stderr, "Calling %s query on database %s with %s=%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName);
+  fprintf(stderr, "Calling %s query on database %s with %s=%s, distFun:%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName, no_unit_norming?"Euclidean":"Normed Euclidean");
 
   INTSTRINGIFY(queryPoint, qPosStr);
   INTSTRINGIFY(pointNN, pointNNStr);
   INTSTRINGIFY(trackNN, trackNNStr);
   INTSTRINGIFY(sequenceLength, seqLenStr);
   DOUBLESTRINGIFY(absolute_threshold, absolute_thresholdStr);
   DOUBLESTRINGIFY(radius, radiusStr);
 
-  // WS queries only support 1-nearest neighbour point reporting
-  // at the moment, until we figure out how to better serve results
   snprintf(qtypeStr, 256, "nsequence");
   const char *argv[]={
     "./audioDB",
     COM_QUERY,
     qtypeStr,

     radiusStr,
     COM_SEQLEN,
     seqLenStr,
     COM_ABSOLUTE_THRESH,
     absolute_thresholdStr,
-    lsh_exact?COM_LSH_EXACT:""
+    lsh_exact?COM_LSH_EXACT:"",
+    no_unit_norming?COM_NO_UNIT_NORMING:"",
   };
 
-  const unsigned argc = 22;
+  const unsigned argc = 23;
   
  
   try {
     audioDB(argc, argv, &adbQueryResponse);
     return SOAP_OK;

     return SOAP_FAULT;
   }
 }
 
 // Query an audioDB database by vector (serialized)
-int adb__shingleQuery(struct soap* soap, xsd__string dbName, struct adb__queryVector qVector, xsd__string keyList, xsd__string timesFileName, xsd__int queryType, xsd__int queryPos, xsd__int pointNN, xsd__int trackNN, xsd__int sequenceLength, xsd__double radius, xsd__double absolute_threshold, xsd__double relative_threshold, xsd__int exhaustive, xsd__int lsh_exact, struct adb__queryResponse &adbQueryResponse){
+int adb__shingleQuery(struct soap* soap, xsd__string dbName, struct adb__queryVector qVector, xsd__string keyList, xsd__string timesFileName, xsd__int queryType, xsd__int queryPos, xsd__int pointNN, xsd__int trackNN, xsd__int sequenceLength, xsd__double radius, xsd__double absolute_threshold, xsd__double relative_threshold, xsd__int exhaustive, xsd__int lsh_exact, xsd__int no_unit_norming, struct adb__queryResponse &adbQueryResponse){
 
   // open a tmp file on the server, write shingle, query as a file with query point 0
   // and shingle length l/dim
   char tmpFileName[] = "/tmp/adb_XXXXXX";
   int tmpFid = mkstemp(tmpFileName);

   if(!sequenceLength)
     sequenceLength = qVector.__sizev/qVector.dim;
 
   int retVal = adb__query(soap, dbName, tmpFileName, keyList, timesFileName, qVector.__sizep?tmpFileName2:0,
 			  queryType, queryPos, pointNN, trackNN, sequenceLength, radius, 
-			  absolute_threshold, relative_threshold, exhaustive, lsh_exact, adbQueryResponse);
+			  absolute_threshold, relative_threshold, exhaustive, lsh_exact, no_unit_norming, adbQueryResponse);
 
   return retVal;
 }
 
 /* Server loop */