From 5c213e98bf7721de20e6bc938eaa40349cba883e Mon Sep 17 00:00:00 2001 From: wufangjie Date: Fri, 28 Jul 2017 08:06:59 +0800 Subject: MAINT: Make `setxor1d' a bit clearer and speed it up --- numpy/lib/arraysetops.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'numpy/lib/arraysetops.py') diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index a454b8725..aa3a05e12 100644 --- a/numpy/lib/arraysetops.py +++ b/numpy/lib/arraysetops.py @@ -375,12 +375,8 @@ def setxor1d(ar1, ar2, assume_unique=False): return aux aux.sort() -# flag = ediff1d( aux, to_end = 1, to_begin = 1 ) == 0 flag = np.concatenate(([True], aux[1:] != aux[:-1], [True])) -# flag2 = ediff1d( flag ) == 0 -# flag2 = flag[1:] == flag[:-1] -# return aux[flag2] - return aux[np.logical_and(flag[1:], flag[:-1])] + return aux[flag[1:] & flag[:-1]] def in1d(ar1, ar2, assume_unique=False, invert=False): -- cgit v1.2.1