filter distances before sorting

mathics · Sep 18, 2016 · ee2e423 · ee2e423
1 parent e0d6226
commit ee2e423
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mathics/builtin/lists.py b/mathics/builtin/lists.py
@@ -4209,15 +4209,16 @@ def nearest(x):
 
             py_distances = [(_to_real_distance(d), i) for i, d in enumerate(distances.leaves)]
 
+            if py_r is not None:
+                py_distances = [(d, i) for d, i in py_distances if d <= py_r]
+
             def pick():
                 if py_n is None:
                     candidates = sorted(py_distances)
                 else:
                     candidates = heapq.nsmallest(py_n, py_distances)
 
                 for d, i in candidates:
-                    if py_r is not None and d > py_r:
-                        break
                     yield repr_p[i]
 
             return Expression('List', *list(pick()))