comparison audioDB.cpp @ 768:b9dbe4611dde

Adding Kullback-Leibler divergence as alternate distance function

     }
     return 0;
   }
 
   // Set no_unit_norm flag  
+  distance_kullback = args_info.distance_kullback_flag;
   no_unit_norming = args_info.no_unit_norming_flag;
   lsh_use_u_functions = args_info.lsh_use_u_functions_flag;
 
   // LSH Index Command
   if(args_info.INDEX_given){

     reporter = new trackAveragingReporter< std::greater< NNresult > >(pointNN, trackNN, nfiles);
     break;
   case O2_SEQUENCE_QUERY:
   case O2_N_SEQUENCE_QUERY:
     qspec.params.accumulation = ADB_ACCUMULATION_PER_TRACK;
-    qspec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
+    if (distance_kullback)
+      qspec.params.distance = ADB_DISTANCE_KULLBACK_LEIBLER_DIVERGENCE;
+    else
+      qspec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
     qspec.params.npoints = pointNN;
     qspec.params.ntracks = trackNN;
     switch(queryType) {
     case O2_SEQUENCE_QUERY:
       if(!(qspec.refine.flags & ADB_REFINE_RADIUS)) {

       break;
     }
     break;
   case O2_ONE_TO_ONE_N_SEQUENCE_QUERY:
     qspec.params.accumulation = ADB_ACCUMULATION_ONE_TO_ONE;
-    qspec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
+    if (distance_kullback)
+      qspec.params.distance = ADB_DISTANCE_KULLBACK_LEIBLER_DIVERGENCE;
+    else
+      qspec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
     qspec.params.npoints = 0;
     qspec.params.ntracks = 0;
     if(!(qspec.refine.flags & ADB_REFINE_RADIUS)) {
       error("query-type not yet supported");
     } else {

     spec.qid.datum = NULL; /* full db sample */
   }
   spec.qid.sequence_length = sequenceLength;
   spec.qid.flags |= usingQueryPoint ? 0 : ADB_QID_FLAG_EXHAUSTIVE;
   spec.qid.sequence_start = queryPoint;
-
-  spec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
+  if (distance_kullback)
+    spec.params.distance = ADB_DISTANCE_KULLBACK_LEIBLER_DIVERGENCE;
+  else
+    spec.params.distance = no_unit_norming ? ADB_DISTANCE_EUCLIDEAN : ADB_DISTANCE_EUCLIDEAN_NORMED;
   spec.params.accumulation = ADB_ACCUMULATION_DB;
   spec.params.npoints = nsamples;
 
   if(!(results = audiodb_sample_spec(adb, &spec))) {
     error("error in audiodb_sample_spec");