diff --git a/ann_benchmarks/distance.py b/ann_benchmarks/distance.py index 9228338..5f5aa07 100644 --- a/ann_benchmarks/distance.py +++ b/ann_benchmarks/distance.py @@ -4,7 +4,6 @@ from scipy.spatial.distance import pdist as scipy_pdist def pdist(a, b, metric): return scipy_pdist([a, b], metric=metric)[0] -# Need own implementation of jaccard because numpy's implementation is different def jaccard(a, b): if len(a) == 0 or len(b) == 0: return 0 @@ -31,7 +30,7 @@ def jaccard(a, b): # 'distance_valid' : lambda a: True # } # } -# Chunjiang Modified 20190216 + metrics = { 'hamming': { 'distance' : lambda a, b: pdist(a, b, "hamming"), @@ -40,7 +39,7 @@ metrics = { # return 1 - jaccard similarity, because smaller distances are better. 'jaccard': { 'distance' : lambda a, b: pdist(a, b, "jaccard"), - 'distance_valid' : lambda a: a < 1 - 1e-5 + 'distance_valid' : lambda a: a < 1 + 1e-5 }, 'euclidean': { 'distance' : lambda a, b: pdist(a, b, "euclidean"),