From 0ba153571e92223da41ef9cb91fd9ee519ac729b Mon Sep 17 00:00:00 2001 From: Ethan-DeBandi99 <16845933+Ethan-DeBandi99@users.noreply.github.com> Date: Wed, 12 Jul 2023 09:10:06 -0400 Subject: [PATCH 1/2] Correcting check array ordering. --- PROTO_tests/tests/setops_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PROTO_tests/tests/setops_test.py b/PROTO_tests/tests/setops_test.py index 65337d460e..e6c070d38a 100644 --- a/PROTO_tests/tests/setops_test.py +++ b/PROTO_tests/tests/setops_test.py @@ -271,11 +271,11 @@ def test_intersect1d_multiarray_str(self, size): ak_result = ak.intersect1d(l1, l2) - la = set(zip(a.to_list(), c.to_list())) - lb = set(zip(b.to_list(), d.to_list())) + la = set(zip(a.to_list(), b.to_list())) + lb = set(zip(c.to_list(), d.to_list())) lr = sorted(la.intersection(lb)) ak_result = [x.to_list() for x in ak_result] - ak_result = list(zip(*ak_result)) + ak_result = sorted(list(zip(*ak_result))) assert ak_result == lr # Test for strings @@ -305,8 +305,8 @@ def test_intersect1d_multiarray_categorical(self, size): ak_result = ak.intersect1d(l1, l2) - la = set(zip(a.to_list(), c.to_list())) - lb = set(zip(b.to_list(), d.to_list())) + la = set(zip(a.to_list(), b.to_list())) + lb = set(zip(c.to_list(), d.to_list())) lr = sorted(la.intersection(lb)) ak_result = [x.to_list() for x in ak_result] ak_result = list(zip(*ak_result)) From b64ef14a1ad4bcb0f517c1694bb1fe408b9af1cc Mon Sep 17 00:00:00 2001 From: Ethan-DeBandi99 <16845933+Ethan-DeBandi99@users.noreply.github.com> Date: Thu, 13 Jul 2023 12:34:03 -0400 Subject: [PATCH 2/2] Updating testing --- PROTO_tests/tests/setops_test.py | 40 +++++++++++++++++++------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/PROTO_tests/tests/setops_test.py b/PROTO_tests/tests/setops_test.py index e6c070d38a..ee5d02f4de 100644 --- a/PROTO_tests/tests/setops_test.py +++ b/PROTO_tests/tests/setops_test.py @@ -177,12 +177,14 @@ def test_in1d_multiarray_cross_type(self, dtype1, dtype2): @pytest.mark.parametrize("size", pytest.prob_size) def test_in1d_multiarray_str(self, size): + if size < 1000: + size = 1000 # large general test - a = ak.random_strings_uniform(1, 5, size) - b = ak.random_strings_uniform(1, 5, size) + a = ak.random_strings_uniform(1, 2, size) + b = ak.random_strings_uniform(1, 2, size) - c = ak.random_strings_uniform(1, 5, size) - d = ak.random_strings_uniform(1, 5, size) + c = ak.random_strings_uniform(1, 2, size) + d = ak.random_strings_uniform(1, 2, size) l1 = [a, b] l2 = [c, d] @@ -200,12 +202,14 @@ def test_in1d_multiarray_str(self, size): @pytest.mark.parametrize("size", pytest.prob_size) def test_in1d_multiarray_categorical(self, size): + if size < 1000: + size = 1000 # large general test - a = ak.Categorical(ak.random_strings_uniform(1, 5, size)) - b = ak.Categorical(ak.random_strings_uniform(1, 5, size)) + a = ak.Categorical(ak.random_strings_uniform(1, 2, size)) + b = ak.Categorical(ak.random_strings_uniform(1, 2, size)) - c = ak.Categorical(ak.random_strings_uniform(1, 5, size)) - d = ak.Categorical(ak.random_strings_uniform(1, 5, size)) + c = ak.Categorical(ak.random_strings_uniform(1, 2, size)) + d = ak.Categorical(ak.random_strings_uniform(1, 2, size)) l1 = [a, b] l2 = [c, d] @@ -259,12 +263,14 @@ def test_intersect1d_multiarray_cross_type(self, dtype1, dtype2): @pytest.mark.parametrize("size", pytest.prob_size) def test_intersect1d_multiarray_str(self, size): + if size < 1000: + size = 1000 # large general test - a = ak.random_strings_uniform(1, 5, size) - b = ak.random_strings_uniform(1, 5, size) + a = ak.random_strings_uniform(1, 2, size) + b = ak.random_strings_uniform(1, 2, size) - c = ak.random_strings_uniform(1, 5, size) - d = ak.random_strings_uniform(1, 5, size) + c = ak.random_strings_uniform(1, 2, size) + d = ak.random_strings_uniform(1, 2, size) l1 = [a, b] l2 = [c, d] @@ -293,12 +299,14 @@ def test_intersect1d_multiarray_str(self, size): @pytest.mark.parametrize("size", pytest.prob_size) def test_intersect1d_multiarray_categorical(self, size): + if size < 1000: + size = 1000 # large general test - a = ak.Categorical(ak.random_strings_uniform(1, 5, size)) - b = ak.Categorical(ak.random_strings_uniform(1, 5, size)) + a = ak.Categorical(ak.random_strings_uniform(1, 2, size)) + b = ak.Categorical(ak.random_strings_uniform(1, 2, size)) - c = ak.Categorical(ak.random_strings_uniform(1, 5, size)) - d = ak.Categorical(ak.random_strings_uniform(1, 5, size)) + c = ak.Categorical(ak.random_strings_uniform(1, 2, size)) + d = ak.Categorical(ak.random_strings_uniform(1, 2, size)) l1 = [a, b] l2 = [c, d]