grainmorph 0.3.0__tar.gz → 0.3.1__tar.gz

{grainmorph-0.3.0/src/grainmorph.egg-info → grainmorph-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grainmorph
-Version: 0.3.0
+Version: 0.3.1
 Summary: Particle shape analysis and visualization library.
 Author: GrainMorph Contributors
 License-Expression: MIT

{grainmorph-0.3.0 → grainmorph-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "grainmorph"
-version = "0.3.0"
+version = "0.3.1"
 authors = [
     { name = "GrainMorph Contributors" }
 ]

grainmorph-0.3.1/src/grainmorph/wadell/discretize.py

@@ -0,0 +1,59 @@
+import math
+
+import numpy as np
+
+
+def discretize_boundary(boundary, max_dev_thresh):
+    num = len(boundary)
+    # Separate columns and plain floats keep each of the many short calls cheap.
+    x = np.append(boundary[:, 0], boundary[0, 0])
+    y = np.append(boundary[:, 1], boundary[0, 1])
+    xs = x.tolist()
+    ys = y.tolist()
+    keep = [0]
+
+    start, end = 0, num
+    while start < num:
+        dev, idx = find_max_deviation(
+            x[start : end + 1],
+            y[start : end + 1],
+            xs[start],
+            ys[start],
+            xs[end],
+            ys[end],
+        )
+        # A peak at either end would not shrink the segment.
+        while dev > max_dev_thresh and 0 < idx < end - start:
+            end = start + idx
+            dev, idx = find_max_deviation(
+                x[start : end + 1],
+                y[start : end + 1],
+                xs[start],
+                ys[start],
+                xs[end],
+                ys[end],
+            )
+
+        if end < num:
+            keep.append(end)
+        start, end = end, num
+
+    return boundary[keep]
+
+
+def find_max_deviation(x, y, x0, y0, x1, y1):
+    dx = x1 - x0
+    dy = y0 - y1
+    chord_sq = dx * dx + dy * dy
+
+    if chord_sq < 1e-12:
+        dist_sq = np.square(x - x0) + np.square(y - y0)
+        idx = int(dist_sq.argmax())
+        return math.sqrt(float(dist_sq[idx])), idx
+
+    dist = dy * x
+    dist += dx * y
+    dist += y1 * x0 - y0 * x1
+    np.abs(dist, out=dist)
+    idx = int(dist.argmax())
+    return float(dist[idx]) / math.sqrt(chord_sq), idx

{grainmorph-0.3.0 → grainmorph-0.3.1/src/grainmorph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grainmorph
-Version: 0.3.0
+Version: 0.3.1
 Summary: Particle shape analysis and visualization library.
 Author: GrainMorph Contributors
 License-Expression: MIT

{grainmorph-0.3.0 → grainmorph-0.3.1}/tests/test_discretize.py

@@ -28,13 +28,16 @@ def test_max_deviation_is_invariant_to_rigid_transforms(angle, offset):
     theta = np.deg2rad(angle)
     axes = np.array([[np.cos(theta), -np.sin(theta)], [np.sin(theta), np.cos(theta)]])
 
-    deviation, idx = find_max_deviation(points @ axes.T + offset)
+    x, y = (points @ axes.T + offset).T
+
+    deviation, idx = find_max_deviation(x, y, x[0], y[0], x[-1], y[-1])
 
     assert deviation == pytest.approx(2.0)
     assert idx == 1
 
 
 def test_max_deviation_with_coincident_endpoints():
-    points = np.array([[1.0, 2.0], [4.0, 6.0], [1.0, 2.0]])
+    x = np.array([1.0, 4.0, 1.0])
+    y = np.array([2.0, 6.0, 2.0])
 
-    assert find_max_deviation(points) == (5.0, 1)
+    assert find_max_deviation(x, y, 1.0, 2.0, 1.0, 2.0) == (5.0, 1)

grainmorph-0.3.0/src/grainmorph/wadell/discretize.py

@@ -1,41 +0,0 @@
-import math
-
-import numpy as np
-
-
-def discretize_boundary(boundary, max_dev_thresh):
-    num = len(boundary)
-    closed = np.vstack([boundary, boundary[0]])
-    keypoints = [boundary[0]]
-
-    start, end = 0, num
-    while start < num:
-        dev, idx = find_max_deviation(closed[start : end + 1])
-        # A peak at either end would not shrink the segment.
-        while dev > max_dev_thresh and 0 < idx < end - start:
-            end = start + idx
-            dev, idx = find_max_deviation(closed[start : end + 1])
-
-        if end < num:
-            keypoints.append(closed[end])
-        start, end = end, num
-
-    return np.array(keypoints)
-
-
-def find_max_deviation(points):
-    x, y = points.T
-    x0, y0 = points[0].tolist()
-    x1, y1 = points[-1].tolist()
-    dx = x1 - x0
-    dy = y0 - y1
-    chord_sq = dx * dx + dy * dy
-
-    if chord_sq < 1e-12:
-        dist_sq = np.square(x - x0) + np.square(y - y0)
-        idx = int(dist_sq.argmax())
-        return math.sqrt(float(dist_sq[idx])), idx
-
-    dist = np.abs(dy * x + dx * y + (y1 * x0 - y0 * x1))
-    idx = int(dist.argmax())
-    return float(dist[idx]) / math.sqrt(chord_sq), idx