Merge pull request erikbern#19 from maau/query-timing

Only measure the time of the actual lookup.

ann_benchmarks/algorithms/subprocess.py

@@ -57,6 +57,7 @@ def __init__(self, args, encoder, params, prepared = False):
             self.query = self.__query_normal
         else:
             self.query = self.__query_prepared
+        self._result_count = None
 
     def supports_prepared_queries(self):
         return self._prepared
@@ -94,7 +95,7 @@ def __handle_query_response(self):
             return results
         else:
             assert status[0] == "fail", """\
-searching for encoded query point '%s' neither succeeded nor failed""" % d
+query neither succeeded nor failed"""
             return []
 
     def prepare_query(self, v, n):
@@ -105,7 +106,23 @@ def prepare_query(self, v, n):
 
     def run_prepared_query(self):
         self.__write("query")
-        return self.__handle_query_response()
+        status = self.__line()
+        if status[0] == "ok":
+            self._result_count = int(status[1])
+        else:
+            assert status[0] == "fail", """\
+query neither succeeded nor failed"""
+            self._result_count = 0
+
+    def get_prepared_query_results(self):
+        results = []
+        i = 0
+        while i < self._result_count:
+            line = self.__line()
+            results.append(int(line[0]))
+            i += 1
+        self._result_count = 0
+        return results
 
     def use_threads(self):
         return False

ann_benchmarks/main.py

@@ -36,8 +36,9 @@ def single_query(t):
                 if prepared_queries:
                     algo.prepare_query(v, 10)
                     start = time.time()
-                    found = algo.run_prepared_query()
+                    algo.run_prepared_query()
                     total = (time.time() - start)
+                    found = algo.get_prepared_query_results()
                 else:
                     start = time.time()
                     found = algo.query(v, 10)