Accelerated AbstractPolygonalAperture using numba. (#145)

Author: roytsmart

.github/workflows/tests.yml

@@ -18,8 +18,8 @@ jobs:
           windows-latest,
           macOS-latest,
         ]
-        python-version: ["3.10", "3.12"]
-    name: ${{ matrix.os }}, Python ${{ matrix.python-version }} lint and test
+        python-version: ["3.11", "3.13"]
+    name: ${{ matrix.os }}, Python ${{ matrix.python-version }} tests
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

optika/apertures/_apertures.py

@@ -374,7 +374,7 @@ class CircularSectorAperture(
     """
 
     angle_stop: u.Quantity | na.AbstractScalar = 180 * u.deg
-    """
+    r"""
     The ending angle of the circular sector.
     Must be between :math:`-2 \pi` and :math:`+2 \pi` radians and 
     counterclockwise from `angle_start`.
@@ -606,34 +606,40 @@ def __call__(
         self,
         position: na.AbstractCartesian3dVectorArray,
     ) -> na.AbstractScalar:
+
         vertices = self.vertices
         active = self.active
         inverted = self.inverted
+
         if self.transformation is not None:
             position = self.transformation.inverse(position)
 
-        shape = na.shape_broadcasted(
-            vertices[dict(vertex=0)],
-            active,
-            inverted,
-            position,
-        )
+        if np.any(active):
+            result = na.geometry.point_in_polygon(
+                x=position.x,
+                y=position.y,
+                vertices_x=vertices.x,
+                vertices_y=vertices.y,
+                axis="vertex",
+            )
 
-        active = na.broadcast_to(active, shape)
-        inverted = na.broadcast_to(inverted, shape)
-        position = na.broadcast_to(position, shape)
+            if np.any(inverted):
+                if np.all(inverted):
+                    result = ~result
+                else:
+                    shape_inverted = na.shape_broadcasted(result, inverted)
+                    if shape_inverted != result.shape:
+                        result = na.broadcast_to(result, shape_inverted).copy()
+                    result[inverted] = ~result[inverted]
+
+            if not np.all(active):
+                shape_active = na.shape_broadcasted(result, active)
+                if shape_active != result.shape:
+                    result = na.broadcast_to(result, shape_active).copy()
+                result[~active] = True
 
-        result = False
-        for v in range(vertices.shape["vertex"]):
-            vert_j = na.broadcast_to(vertices[dict(vertex=v - 1)], shape)
-            vert_i = na.broadcast_to(vertices[dict(vertex=v)], shape)
-            slope = (vert_j.y - vert_i.y) / (vert_j.x - vert_i.x)
-            condition_1 = (vert_i.y > position.y) != (vert_j.y > position.y)
-            condition_2 = position.x < ((position.y - vert_i.y) / slope + vert_i.x)
-            result = result ^ (condition_1 & condition_2)
-
-        result[inverted] = ~result[inverted]
-        result[~active] = True
+        else:
+            result = na.ScalarArray(True)
 
         return result
 

optika/apertures/_apertures_test.py

@@ -10,10 +10,12 @@
 
 active_parameterization = [
     True,
+    False,
     na.linspace(-1, 1, "active", 3) >= 0,
 ]
 
 inverted_parameterization = [
+    True,
     False,
     na.linspace(-1, 1, "inverted", 4) >= 0,
 ]
@@ -52,7 +54,8 @@ def test__call__(self, a: optika.apertures.AbstractAperture):
 
         result = a(position)
         assert np.issubdtype(na.get_dtype(result), bool)
-        assert np.any(result)
+
+        assert np.all(result[~na.as_named_array(a.active)])
 
     @pytest.mark.parametrize("rays", optika.rays._tests.test_ray_vectors.rays)
     def test_clip_rays(

pyproject.toml

@@ -9,13 +9,13 @@ authors = [
 ]
 description = "A Python library for simulating optical systems, similar to Zemax"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
     "astropy!=6.1.5",
-    "named-arrays>=0.27.1",
+    "named-arrays~=1.0",
     "pymupdf",
     "joblib",
 ]
@@ -29,7 +29,6 @@ doc = [
     "pytest",
     "matplotlib",
     "graphviz",
-    "Sphinx<8.2",
     "sphinx-autodoc-typehints",
     "sphinxcontrib-bibtex",
     "pydata-sphinx-theme",