changeset 696:bb9478d5b57e

support distinction between exhaustive / nonexhaustive sampling Only for when a datum is given (either as key or -- upcoming -- as double float data, e.g. from a feature file).
author mas01cr
date Thu, 22 Apr 2010 21:04:04 +0000
parents 01e25f938b63
children 2741bbda39d7
files audioDB.cpp
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/audioDB.cpp	Thu Apr 22 21:03:59 2010 +0000
+++ b/audioDB.cpp	Thu Apr 22 21:04:04 2010 +0000
@@ -341,7 +341,13 @@
       query_from_key = true;
       key = args_info.key_arg;
     }
-    
+    if(!args_info.exhaustive_flag){
+      queryPoint = args_info.qpoint_arg;
+      usingQueryPoint=1;
+      if(queryPoint<0 || queryPoint >O2_MAX_VECTORS)
+        error("queryPoint out of range: 0 <= queryPoint <= O2_MAX_VECTORS");
+    }
+
 
     return 0;
   }
@@ -1072,7 +1078,6 @@
   if(query_from_key) {
     datum.key = key;
     spec.qid.datum = &datum;
-    spec.qid.flags |= ADB_QID_FLAG_EXHAUSTIVE;
     spec.refine.flags |= ADB_REFINE_EXCLUDE_KEYLIST;
     spec.refine.exclude.nkeys = 1;
     spec.refine.exclude.keys = &key;