updated the unit tests after removing the "transpose" argument from "intersections_plane()" and reverted the format of some of the function calls to reduce the number of changed lines

Author: jewettaijfc

tests/test_components/test_geometry.py

@@ -207,11 +207,11 @@ def test_array_to_vertices():
     assert np.all(np.array(vertices) == np.array(vertices2))
 
 
-@pytest.mark.parametrize("component, transpose", zip(GEO_TYPES, [True, False]))
-def test_intersections_plane(component, transpose):
-    assert len(component.intersections_plane(z=0.2, transpose=transpose)) > 0
-    assert len(component.intersections_plane(x=0.2, transpose=transpose)) > 0
-    assert len(component.intersections_plane(x=10000, transpose=transpose)) == 0
+@pytest.mark.parametrize("component", GEO_TYPES)
+def test_intersections_plane(component):
+    assert len(component.intersections_plane(z=0.2)) > 0
+    assert len(component.intersections_plane(x=0.2)) > 0
+    assert len(component.intersections_plane(x=10000)) == 0
 
 
 def test_intersections_plane_inf():
@@ -780,25 +780,24 @@ def test_pop_axis():
         assert Ly == _Ly
 
 
-@pytest.mark.parametrize("transpose", [True, False])
-def test_2b_box_intersections(transpose):
+def test_2b_box_intersections():
     plane = td.Box(size=(1, 4, 0))
     box1 = td.Box(size=(1, 1, 1))
     box2 = td.Box(size=(1, 1, 1), center=(3, 0, 0))
 
-    result = plane.intersections_with(box1, transpose=transpose)
+    result = plane.intersections_with(box1)
     assert len(result) == 1
     assert result[0].geom_type == "Polygon"
-    assert len(plane.intersections_with(box2, transpose=transpose)) == 0
+    assert len(plane.intersections_with(box2)) == 0
 
     with pytest.raises(ValidationError):
-        _ = box1.intersections_with(box2, transpose=transpose)
+        _ = box1.intersections_with(box2)
 
-    assert len(box1.intersections_2dbox(plane, transpose=transpose)) == 1
-    assert len(box2.intersections_2dbox(plane, transpose=transpose)) == 0
+    assert len(box1.intersections_2dbox(plane)) == 1
+    assert len(box2.intersections_2dbox(plane)) == 0
 
     with pytest.raises(ValidationError):
-        _ = box2.intersections_2dbox(box1, transpose=transpose)
+        _ = box2.intersections_2dbox(box1)
 
 
 def test_polyslab_merge():
@@ -975,11 +974,11 @@ def test_custom_surface_geometry(transpose, tmp_path):
 
     # test intersections
     assert shapely.equals(
-        geom.intersections_plane(x=0, transpose=transpose),
+        geom.intersections_plane(x=0),
         shapely.Polygon([[0, 0], [0, 1], [1, 0]]),
     )
     assert shapely.equals(
-        geom.intersections_plane(z=0.5, transpose=transpose),
+        geom.intersections_plane(z=0.5),
         shapely.Polygon([[0, 0], [0, 0.5], [0.5, 0]]),
     )
 

tidy3d/components/geometry/base.py

@@ -218,10 +218,7 @@ def inside_meshgrid(
 
     @abstractmethod
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -243,10 +240,7 @@ def intersections_tilted_plane(
         """
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ) -> list[Shapely]:
         """Returns list of shapely geometries at plane specified by one non-None value of x,y,z.
 
@@ -774,10 +768,7 @@ def evaluate_inf_shape(shape: Shapely) -> Shapely:
         return shape
 
     @staticmethod
-    def pop_axis(
-        coord: tuple[Any, Any, Any],
-        axis: int,
-    ) -> tuple[Any, tuple[Any, Any]]:
+    def pop_axis(coord: tuple[Any, Any, Any], axis: int) -> tuple[Any, tuple[Any, Any]]:
         """Separates coordinate at ``axis`` index from coordinates on the plane tangent to ``axis``.
 
         Parameters
@@ -799,11 +790,7 @@ def pop_axis(
         return axis_val, tuple(plane_vals)
 
     @staticmethod
-    def unpop_axis(
-        ax_coord: Any,
-        plane_coords: tuple[Any, Any],
-        axis: int,
-    ) -> tuple[Any, Any, Any]:
+    def unpop_axis(ax_coord: Any, plane_coords: tuple[Any, Any], axis: int) -> tuple[Any, Any, Any]:
         """Combine coordinate along axis with coordinates on the plane tangent to the axis.
 
         Parameters
@@ -1602,10 +1589,7 @@ class SimplePlaneIntersection(Geometry, ABC):
     """A geometry where intersections with an axis aligned plane may be computed efficiently."""
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
         Checks special cases before relying on the complete computation.
@@ -1651,11 +1635,7 @@ def transform(p_array):
 
     @abstractmethod
     def _do_intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
-        transpose: bool = False,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -1735,10 +1715,7 @@ def finite_length_axis(self) -> float:
         return min(self.length_axis, LARGE_NUMBER)
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ):
         """Returns shapely geometry at plane specified by one non None value of x,y,z.
 
@@ -2055,10 +2032,7 @@ def surfaces_with_exclusion(cls, size: Size, center: Coordinate, **kwargs):
 
     @verify_packages_import(["trimesh"])
     def _do_intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -2109,10 +2083,7 @@ def _do_intersections_tilted_plane(
         return path.polygons_full
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ):
         """Returns shapely geometry at plane specified by one non None value of x,y,z.
 
@@ -2698,10 +2669,7 @@ def bounds(self) -> Bound:
         return (tuple(vertices.min(axis=1)), tuple(vertices.max(axis=1)))
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -3010,10 +2978,7 @@ def _bit_operation(self) -> Callable[[Any, Any], Any]:
         return result
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -3043,10 +3008,7 @@ def intersections_tilted_plane(
         )
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ) -> list[Shapely]:
         """Returns list of shapely geometries at plane specified by one non-None value of x,y,z.
 
@@ -3230,10 +3192,7 @@ def bounds(self) -> Bound:
         )
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -3260,10 +3219,7 @@ def intersections_tilted_plane(
         ]
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ) -> list[Shapely]:
         """Returns list of shapely geometries at plane specified by one non-None value of x,y,z.
 

tidy3d/components/geometry/mesh.py

@@ -527,10 +527,7 @@ def bounds(self) -> Bound:
         return self.trimesh.bounds
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -557,10 +554,7 @@ def intersections_tilted_plane(
         return path.polygons_full
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ) -> list[Shapely]:
         """Returns list of shapely geometries at plane specified by one non-None value of x,y,z.
 

tidy3d/components/geometry/polyslab.py

@@ -583,10 +583,7 @@ def _move_axis_reverse(arr):
 
     @verify_packages_import(["trimesh"])
     def _do_intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -2355,10 +2352,7 @@ def _dilation_value_at_reference_to_coord(self, dilation: float) -> float:
         return z_coord
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 

tidy3d/components/geometry/primitives.py

@@ -69,10 +69,7 @@ def inside(
         return (dist_x**2 + dist_y**2 + dist_z**2) <= (self.radius**2)
 
     def intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -113,10 +110,7 @@ def intersections_tilted_plane(
         return [shapely.Polygon(vertices[:, :2])]
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
-        z: Optional[float] = None,
+        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
     ):
         """Returns shapely geometry at plane specified by one non None value of x,y,z.
 
@@ -382,10 +376,7 @@ def _update_from_bounds(self, bounds: tuple[float, float], axis: Axis) -> Cylind
 
     @verify_packages_import(["trimesh"])
     def _do_intersections_tilted_plane(
-        self,
-        normal: Coordinate,
-        origin: Coordinate,
-        to_2D: MatrixReal4x4,
+        self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.