From f8a7e8d41da3f4aa91c629df4a46a8c7347c1b8c Mon Sep 17 00:00:00 2001
From: Alex Fikl <alexfikl@gmail.com>
Date: Sat, 14 Apr 2018 19:12:55 -0500
Subject: [PATCH] simplify test data generation
---
test/test_matrixgen.py | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/test/test_matrixgen.py b/test/test_matrixgen.py
index 4e2b3ad7..eb85052b 100644
--- a/test/test_matrixgen.py
+++ b/test/test_matrixgen.py
@@ -63,6 +63,19 @@ def create_arguments(n, mode, target_radius=1.0):
return targets, sources, centers, sigma, expansion_radii
+def create_subset(indices, ranges, factor):
+ indices_ = np.empty(ranges.shape[0] - 1, dtype=np.object)
+ for i in range(ranges.shape[0] - 1):
+ iidx = indices[np.s_[ranges[i]:ranges[i + 1]]]
+ indices_[i] = np.sort(np.random.choice(iidx,
+ size=int(factor * len(iidx)), replace=False))
+
+ ranges_ = np.cumsum([0] + [r.shape[0] for r in indices_])
+ indices_ = np.hstack(indices_)
+
+ return indices_, ranges_
+
+
def test_qbx_direct(ctx_getter):
# This evaluates a single layer potential on a circle.
logging.basicConfig(level=logging.INFO)
@@ -154,13 +167,14 @@ def test_p2p_direct(ctx_getter, exclude_self):
strengths = (sigma * h,)
tgtindices = np.arange(0, n)
- tgtindices = np.random.choice(tgtindices, size=int(0.8 * n))
tgtranges = np.arange(0, tgtindices.shape[0] + 1,
tgtindices.shape[0] // nblks)
+ tgtindices, tgtranges = create_subset(tgtindices, tgtranges, 0.6)
+
srcindices = np.arange(0, n)
- srcindices = np.random.choice(srcindices, size=int(0.8 * n))
srcranges = np.arange(0, srcindices.shape[0] + 1,
srcindices.shape[0] // nblks)
+ srcindices, srcranges = create_subset(srcindices, srcranges, 0.6)
assert tgtranges.shape == srcranges.shape
extra_kwargs = {}
--
GitLab