Updated kdtree-scipy dependency and patch

This commit is contained in:
Guilhem Lavaux 2014-06-24 13:49:11 +02:00
parent b871f23a20
commit bdd3c9ab65
2 changed files with 12 additions and 22 deletions

19
external/patch_kdtree vendored
View file

@ -1,12 +1,12 @@
--- periodic_kdtree.py.old 2014-04-18 17:30:39.000000000 +0200
+++ periodic_kdtree.py 2014-04-18 17:31:59.000000000 +0200
--- periodic_kdtree.py.old 2014-05-31 17:08:00.000000000 +0200
+++ periodic_kdtree.py 2014-06-24 13:42:13.769770000 +0200
@@ -102,7 +102,7 @@
# all neighbors within the given distance_upper_bound".
# Cap distance_upper_bound
- distance_upper_bound = np.min(distance_upper_bound,
+ distance_upper_bound = min(distance_upper_bound,
self.max_distance_upper_bound)
- distance_upper_bound = np.min([distance_upper_bound,
+ distance_upper_bound = min([distance_upper_bound,
self.max_distance_upper_bound])
# Run queries over all relevant images of x
@@ -128,7 +128,7 @@
@ -18,12 +18,3 @@
# Run queries over all relevant images of x
results = []
@@ -213,7 +213,7 @@
# all neighbors within the given distance_upper_bound".
# Cap distance_upper_bound
- distance_upper_bound = np.min(distance_upper_bound,
+ distance_upper_bound = min(distance_upper_bound,
self.max_distance_upper_bound)
# Run queries over all relevant images of x