open-space-toolkit-mathematics 2.0.2__py39-none-any.whl → 2.0.4__py39-none-any.whl

{open_space_toolkit_mathematics-2.0.2.dist-info → open_space_toolkit_mathematics-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: open-space-toolkit-mathematics
-Version: 2.0.2
+Version: 2.0.4
 Summary: Geometry, curve fitting, optimization.
 Author: Open Space Collective
 Author-email: contact@open-space-collective.org

{open_space_toolkit_mathematics-2.0.2.dist-info → open_space_toolkit_mathematics-2.0.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ostk/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/mathematics/OpenSpaceToolkitMathematicsPy.cpython-39-x86_64-linux-gnu.so,sha256=q7rGkUhu3hnRedFhpymM4eCm9kGyBCVYxCbiKMRwSH0,1476312
+ostk/mathematics/OpenSpaceToolkitMathematicsPy.cpython-39-x86_64-linux-gnu.so,sha256=PBf38fJpo3tH5mrQC4T0CsC_EIdJ2Ftn5Xhtg3Nmjnw,1484504
 ostk/mathematics/__init__.py,sha256=U81I6jh2hIPyuT4dtZjNcLi-CQ8yXIvtFn32tVK1YCY,92
 ostk/mathematics/libopen-space-toolkit-mathematics.so.2,sha256=pqy9-fu6_kOobH5sEvdIA2PmIvBXCxyocb2dews5ntg,112619928
 ostk/mathematics/test/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
@@ -30,11 +30,11 @@ ostk/mathematics/test/geometry/d3/test_intersection.py,sha256=7QrduhVXyTHG0lGLEH
 ostk/mathematics/test/geometry/d3/test_object.py,sha256=7QrduhVXyTHG0lGLEHNgv4olvFrR6TR0MNgu9acmRd4,61
 ostk/mathematics/test/geometry/d3/test_transformation.py,sha256=7QrduhVXyTHG0lGLEHNgv4olvFrR6TR0MNgu9acmRd4,61
 ostk/mathematics/test/geometry/d3/object/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/mathematics/test/geometry/d3/object/test_composite.py,sha256=1MAsiYqbIHz2NAIcryte7nkL-olW9kpqQIEm27KLCn4,4410
+ostk/mathematics/test/geometry/d3/object/test_composite.py,sha256=03wi6k35a2lwyM29q5STjqX4CHL1IofYm2hBzERQlzU,7710
 ostk/mathematics/test/geometry/d3/object/test_cuboid.py,sha256=xJp6ImRnkNw_k6Tt8RaSXlsGnSqM-SlQSBfbm7SwJuA,470
 ostk/mathematics/test/geometry/d3/object/test_line.py,sha256=d-CvDjXeH1WQcleCU2yt4FdHLhWgy45NGzn3mEwy6xE,1690
 ostk/mathematics/test/geometry/d3/object/test_linestring.py,sha256=pocs-AGFbjfRAzfpYOfQ-vivRZ7KdGxS86m8MjHmPSQ,5916
-ostk/mathematics/test/geometry/d3/object/test_point.py,sha256=11oJhQtrcQHZ1k6hjQZ3W3_6UsM9_ak_1ZNSfYBrAXA,6647
+ostk/mathematics/test/geometry/d3/object/test_point.py,sha256=-5Cjy3Pru3UWbMO7vBDNiJYfUkqVVxxZtDgsMYYaosc,6611
 ostk/mathematics/test/geometry/d3/object/test_point_set.py,sha256=p5A1gM9UfB_-GgEavN-7Z8IgFc4qp1nAnHRYKTecvS0,3506
 ostk/mathematics/test/geometry/d3/object/test_polygon.py,sha256=7ZjucWMsNzppN3pptxHgGgOtOGv1grseT7VnctgOJP4,4262
 ostk/mathematics/test/geometry/d3/object/test_segment.py,sha256=HWg-BCJoa74EgWlvUPd85v_qR2p9THi0ejhtG0EQNEA,4027
@@ -48,8 +48,8 @@ ostk/mathematics/test/object/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-
 ostk/mathematics/test/object/test_interval.py,sha256=yZT4eo5kM4iBE1GBoOxlESaUl5QL3xdsZwrG-6fA7ME,17941
 ostk/mathematics/test/object/test_vector.py,sha256=5MG3s8vhgoGKAIc5GzswlZObyIrJDIPNtsEd5wNORPU,76
 ostk/mathematics/test/solver/test_numerical_solver.py,sha256=fY7e6imxsj6PU_LXV9YcjNvddfegrqDjw9TmHUPA-kQ,5667
-open_space_toolkit_mathematics-2.0.2.dist-info/METADATA,sha256=512r4CzLPxtbE5rDsxFYn603kME5MzptfGqoD4v8fQw,1806
-open_space_toolkit_mathematics-2.0.2.dist-info/WHEEL,sha256=5QfLU7RJJCZZ3ERZV_rtHDh5D6BqH-rQ7cKm5M1VoS0,93
-open_space_toolkit_mathematics-2.0.2.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
-open_space_toolkit_mathematics-2.0.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-open_space_toolkit_mathematics-2.0.2.dist-info/RECORD,,
+open_space_toolkit_mathematics-2.0.4.dist-info/METADATA,sha256=by-U9v5nHzjZf4pW4Z6R67TvejD6d63iWvQMrkndx3c,1806
+open_space_toolkit_mathematics-2.0.4.dist-info/WHEEL,sha256=5QfLU7RJJCZZ3ERZV_rtHDh5D6BqH-rQ7cKm5M1VoS0,93
+open_space_toolkit_mathematics-2.0.4.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
+open_space_toolkit_mathematics-2.0.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+open_space_toolkit_mathematics-2.0.4.dist-info/RECORD,,

ostk/mathematics/test/geometry/d3/object/test_composite.py

@@ -2,142 +2,261 @@
 
 import pytest
 
-import ostk.mathematics as mathematics
+import numpy as np
 
+from ostk.mathematics.geometry import Angle
+from ostk.mathematics.geometry.d2.object import Point as Point2d
+from ostk.mathematics.geometry.d2.object import Polygon as Polygon2d
+from ostk.mathematics.geometry.d3 import Object as Object
+from ostk.mathematics.geometry.d3.object import Composite as Composite
+from ostk.mathematics.geometry.d3.object import Point
+from ostk.mathematics.geometry.d3.object import PointSet
+from ostk.mathematics.geometry.d3.object import Line
+from ostk.mathematics.geometry.d3.object import Ray
+from ostk.mathematics.geometry.d3.object import Segment
+from ostk.mathematics.geometry.d3.object import LineString
+from ostk.mathematics.geometry.d3.object import Polygon
+from ostk.mathematics.geometry.d3.object import Plane
+from ostk.mathematics.geometry.d3.object import Sphere
+from ostk.mathematics.geometry.d3.object import Ellipsoid
+from ostk.mathematics.geometry.d3.object import Pyramid
+from ostk.mathematics.geometry.d3.object import Cone
 
-Point2d = mathematics.geometry.d2.object.Point
-Polygon2d = mathematics.geometry.d2.object.Polygon
-Object = mathematics.geometry.d3.Object
-Composite = mathematics.geometry.d3.object.Composite
-Point3d = mathematics.geometry.d3.object.Point
-Segment = mathematics.geometry.d3.object.Segment
-Polygon3d = mathematics.geometry.d3.object.Polygon
 
+@pytest.fixture
+def point() -> Point:
+    return Point(1.0, 2.0, 1.0)
 
-def test_geometry_d3_object_composite_constructor():
-    point_1: Point3d = Point3d(1.0, 2.0, 1.0)
-    point_2: Point3d = Point3d(1.0, 1.0, 1.0)
 
-    segment: Segment = Segment(point_1, point_2)
+@pytest.fixture
+def point_set(point: Point) -> PointSet:
+    return PointSet([point])
 
-    composite_1 = Composite(segment)
-
-    assert composite_1 is not None
-    assert isinstance(composite_1, Composite)
-    assert composite_1.is_defined()
-
-    point_3: Point2d = Point2d(-1.0, 1.0)
-    point_4: Point2d = Point2d(1.0, 1.0)
-    point_5: Point2d = Point2d(1.0, -1.0)
-    point_6: Point2d = Point2d(-1.0, -1.0)
-    point_7: Point3d = Point3d(1.0, 1.0, 1.0)
-    vector_1 = (1.0, 0.0, 0.0)
-    vector_2 = (0.0, 1.0, 0.0)
 
-    polygon2d: Polygon2d = Polygon2d([point_3, point_4, point_5, point_6])
-    polygon3d: Polygon3d = Polygon3d(polygon2d, point_7, vector_1, vector_2)
+@pytest.fixture
+def direction() -> np.ndarray:
+    return np.array([1.0, 0.0, 0.0])
 
-    composite_2: Composite = Composite(polygon3d)
 
-    assert composite_2 is not None
-    assert isinstance(composite_2, Composite)
-    assert composite_2.is_defined()
+@pytest.fixture
+def line(point: Point, direction: np.ndarray) -> Line:
+    return Line(point, direction)
 
 
-def test_geometry_d3_object_composite_empty():
-    composite: Composite = Composite.empty()
+@pytest.fixture
+def ray(point: Point, direction: np.ndarray) -> Ray:
+    return Ray(point, direction)
 
-    assert composite is not None
-    assert isinstance(composite, Composite)
-    assert isinstance(composite, Object)
-    assert composite.is_defined()
-    assert composite.is_empty()
 
+@pytest.fixture
+def segment():
+    point_1: Point = Point(1.0, 2.0, 1.0)
+    point_2: Point = Point(1.0, 1.0, 1.0)
+    return Segment(point_1, point_2)
 
-def test_geometry_d3_object_composite_comparators():
-    point_1: Point3d = Point3d(1.0, 2.0, 1.0)
-    point_2: Point3d = Point3d(1.0, 1.0, 1.0)
-    point_3: Point3d = Point3d(1.0, 4.0, 1.0)
 
-    segment_1: Segment = Segment(point_1, point_2)
-    segment_2: Segment = Segment(point_1, point_3)
-    segment_3: Segment = Segment(point_2, point_1)
+@pytest.fixture
+def line_string() -> LineString:
+    point_1: Point = Point(1.0, 2.0, 1.0)
+    point_2: Point = Point(1.0, 1.0, 1.0)
+    return LineString([point_1, point_2])
 
-    composite_1 = Composite(segment_1)
-    composite_2 = Composite(segment_2)
-    composite_3 = Composite(segment_3)
 
-    assert composite_1 == composite_3
-    assert composite_1 != composite_2
-    assert composite_2 != composite_3
+@pytest.fixture
+def polygon2d() -> Polygon2d:
+    point_1: Point2d = Point2d(-1.0, 1.0)
+    point_2: Point2d = Point2d(1.0, 1.0)
+    point_3: Point2d = Point2d(1.0, -1.0)
+    point_4: Point2d = Point2d(-1.0, -1.0)
+    return Polygon2d([point_1, point_2, point_3, point_4])
 
 
-def tes_geometry_d3_object_composite_addition_operator():
-    point_1: Point3d = Point3d(1.0, 2.0, 1.0)
-    point_2: Point3d = Point3d(1.0, 1.0, 1.0)
-    point_3: Point3d = Point3d(1.0, 4.0, 1.0)
+@pytest.fixture
+def polygon(point: Point, polygon2d: Polygon2d) -> Polygon:
+    vector_1 = (1.0, 0.0, 0.0)
+    vector_2 = (0.0, 1.0, 0.0)
+    return Polygon(polygon2d, point, vector_1, vector_2)
 
-    segment_1: Segment = Segment(point_1, point_2)
-    segment_2: Segment = Segment(point_1, point_3)
 
-    composite_1 = Composite(segment_1)
-    composite_2 = Composite(segment_2)
+@pytest.fixture
+def plane(point: Point, direction: np.ndarray) -> Plane:
+    return Plane(point, direction)
 
-    composite_3 = composite_1 + composite_2
 
-    assert composite_3 is not None
-    assert isinstance(composite_3, Composite)
-    assert composite_3.is_defined()
-    assert composite_3.get_object_count() == 2
+@pytest.fixture
+def sphere(point: Point) -> Sphere:
+    return Sphere(point, 1.0)
 
-    with pytest.raises(RuntimeError):
-        composite = Composite.undefined() + composite_1
 
-    with pytest.raises(RuntimeError):
-        composite = composite_1 + Composite.undefined()
+@pytest.fixture
+def ellipsoid(point: Point) -> Ellipsoid:
+    return Ellipsoid(point, 1.0, 1.0, 1.0)
 
-    composite_3 += composite_1
 
-    assert isinstance(composite_3, Composite)
-    assert composite_3.is_defined()
-    assert composite_3.get_object_count() == 3
+@pytest.fixture
+def pyramid(polygon: Polygon, point: Point) -> Pyramid:
+    return Pyramid(polygon, point)
 
-    with pytest.raises(RuntimeError):
-        composite_3 += Composite.undefined()
 
+@pytest.fixture
+def cone(point: Point, direction: np.ndarray) -> Cone:
+    return Cone(point, direction, Angle.degrees(5.0))
 
-def test_geometry_d3_object_composite_access_object_at():
-    point_1: Point3d = Point3d(1.0, 2.0, 1.0)
-    point_2: Point3d = Point3d(1.0, 1.0, 1.0)
 
-    segment: Segment = Segment(point_1, point_2)
+@pytest.fixture
+def composite_with_polygon(segment: Segment, polygon: Polygon) -> Composite:
     composite_1 = Composite(segment)
-
-    object = composite_1.access_object_at(0)
-
-    assert object is not None
-    assert isinstance(object, Object)
-    assert isinstance(object, Segment)
-
-    point_3: Point2d = Point2d(-1.0, 1.0)
-    point_4: Point2d = Point2d(1.0, 1.0)
-    point_5: Point2d = Point2d(1.0, -1.0)
-    point_6: Point2d = Point2d(-1.0, -1.0)
-    point_7: Point3d = Point3d(1.0, 1.0, 1.0)
-    vector_1 = (1.0, 0.0, 0.0)
-    vector_2 = (0.0, 1.0, 0.0)
-
-    polygon2d: Polygon2d = Polygon2d([point_3, point_4, point_5, point_6])
-    polygon3d: Polygon3d = Polygon3d(polygon2d, point_7, vector_1, vector_2)
-    composite_2: Composite = Composite(polygon3d)
-
-    composite_3 = composite_1 + composite_2
-
-    object_1 = composite_3.access_object_at(0)
-    object_2 = composite_3.access_object_at(1)
-
-    assert object_1 == segment
-    assert object_2 == polygon3d
-
-    with pytest.raises(RuntimeError):
-        composite_3.access_object_at(2)
+    return composite_1 + Composite(polygon)
+
+
+class Test3DComposite:
+    @pytest.mark.parametrize(
+        "geometry_name",
+        [
+            ("point"),
+            ("point_set"),
+            ("line"),
+            ("ray"),
+            ("segment"),
+            ("line_string"),
+            ("polygon"),
+            ("plane"),
+            ("sphere"),
+            ("ellipsoid"),
+            ("pyramid"),
+            ("cone"),
+        ],
+    )
+    def test_geometry_d3_object_composite_constructor(self, geometry_name: str, request):
+        geometry = request.getfixturevalue(geometry_name)
+        composite: Composite = Composite(geometry)
+
+        assert composite is not None
+        assert isinstance(composite, Composite)
+        assert composite.is_defined()
+
+    def test_geometry_d3_object_composite_empty(self):
+        composite: Composite = Composite.empty()
+
+        assert composite is not None
+        assert isinstance(composite, Composite)
+        assert isinstance(composite, Object)
+        assert composite.is_defined()
+        assert composite.is_empty()
+
+    def test_geometry_d3_object_composite_comparators(self):
+        point_1: Point = Point(1.0, 2.0, 1.0)
+        point_2: Point = Point(1.0, 1.0, 1.0)
+        point_3: Point = Point(1.0, 4.0, 1.0)
+
+        segment_1: Segment = Segment(point_1, point_2)
+        segment_2: Segment = Segment(point_1, point_3)
+        segment_3: Segment = Segment(point_2, point_1)
+
+        composite_1 = Composite(segment_1)
+        composite_2 = Composite(segment_2)
+        composite_3 = Composite(segment_3)
+
+        assert composite_1 == composite_3
+        assert composite_1 != composite_2
+        assert composite_2 != composite_3
+
+    def tes_geometry_d3_object_composite_addition_operator(self):
+        point_1: Point = Point(1.0, 2.0, 1.0)
+        point_2: Point = Point(1.0, 1.0, 1.0)
+        point_3: Point = Point(1.0, 4.0, 1.0)
+
+        segment_1: Segment = Segment(point_1, point_2)
+        segment_2: Segment = Segment(point_1, point_3)
+
+        composite_1 = Composite(segment_1)
+        composite_2 = Composite(segment_2)
+
+        composite_3 = composite_1 + composite_2
+
+        assert composite_3 is not None
+        assert isinstance(composite_3, Composite)
+        assert composite_3.is_defined()
+        assert composite_3.get_object_count() == 2
+
+        with pytest.raises(RuntimeError):
+            composite = Composite.undefined() + composite_1
+
+        with pytest.raises(RuntimeError):
+            composite = composite_1 + Composite.undefined()
+
+        composite_3 += composite_1
+
+        assert isinstance(composite_3, Composite)
+        assert composite_3.is_defined()
+        assert composite_3.get_object_count() == 3
+
+        with pytest.raises(RuntimeError):
+            composite_3 += Composite.undefined()
+
+    def test_geometry_d3_object_composite_access_object_at(
+        self,
+        composite_with_polygon: Composite,
+    ):
+        object: Object = composite_with_polygon.access_object_at(0)
+
+        assert object is not None
+        assert isinstance(object, Object)
+        assert isinstance(object, Segment)
+
+        object_2: Object = composite_with_polygon.access_object_at(1)
+
+        assert object_2 is not None
+        assert isinstance(object_2, Object)
+        assert isinstance(object_2, Polygon)
+
+        with pytest.raises(RuntimeError):
+            composite_with_polygon.access_object_at(2)
+
+    @pytest.mark.parametrize(
+        "geometry_name",
+        [
+            ("point"),
+            ("point_set"),
+            ("line"),
+            ("ray"),
+            ("segment"),
+            ("line_string"),
+            ("polygon"),
+            ("plane"),
+            ("sphere"),
+            ("ellipsoid"),
+            ("pyramid"),
+            ("cone"),
+        ],
+    )
+    def test_geometry_d3_object_composite_is(self, geometry_name: str, request):
+        geometry = request.getfixturevalue(geometry_name)
+        composite: Composite = Composite(geometry)
+
+        assert composite.is_defined()
+        assert getattr(composite, f"is_{geometry_name}")()
+
+    @pytest.mark.parametrize(
+        "geometry_name",
+        [
+            ("point"),
+            ("point_set"),
+            ("line"),
+            ("ray"),
+            ("segment"),
+            ("line_string"),
+            ("polygon"),
+            ("plane"),
+            ("sphere"),
+            ("ellipsoid"),
+            ("pyramid"),
+            ("cone"),
+        ],
+    )
+    def test_geometry_d3_object_composite_as(self, geometry_name: str, request):
+        geometry = request.getfixturevalue(geometry_name)
+        composite: Composite = Composite(geometry)
+
+        assert composite.is_defined()
+        assert getattr(composite, f"as_{geometry_name}")().is_defined()

ostk/mathematics/test/geometry/d3/object/test_point.py

@@ -8,9 +8,6 @@ import numpy as np
 
 import ostk.mathematics as mathematics
 
-from ostk.core.type import String
-
-
 Object = mathematics.geometry.d3.Object
 Point = mathematics.geometry.d3.object.Point
 Transformation = mathematics.geometry.d3.Transformation