fixed typing and added small bug fixes

Author: tomvanmele

src/compas_model/geometry/gjk2.py

@@ -1,10 +1,13 @@
+from typing import Sequence
+from typing import Union
+
 from compas.geometry import Point
 from compas.geometry import Polygon
 from compas.geometry import Vector
 from compas.geometry import dot_vectors
 
 
-def triplecross(u: Vector, v: Vector) -> Vector:
+def triplecross(u: Vector, v: Union[Point, Vector]) -> Vector:
     """Compute the vector perpendicular to u in the plane uxv and in the same directio as v.
 
         Parameters
@@ -27,7 +30,7 @@ def triplecross(u: Vector, v: Vector) -> Vector:
 # =============================================================================
 
 
-def support_poly(points: list[Point], direction: Vector) -> Point:
+def support_poly(points: Union[Polygon, Sequence[Union[Point, Vector]]], direction: Vector) -> Union[Point, Vector]:
     """Find the point in a list of points that is farthest away from the origin in a given direction.
 
     Parameters
@@ -52,7 +55,11 @@ def support_poly(points: list[Point], direction: Vector) -> Point:
     return point
 
 
-def support_poly_poly(A: list[Vector], B: list[Vector], direction: Vector) -> Vector:
+def support_poly_poly(
+    A: Union[Polygon, Sequence[Union[Point, Vector]]],
+    B: Union[Polygon, Sequence[Union[Point, Vector]]],
+    direction: Vector,
+) -> Vector:
     """Compute a support point on the Minkowski sum of A and -B in the given direction.
 
     Parameters
@@ -77,7 +84,8 @@ def support_poly_poly(A: list[Vector], B: list[Vector], direction: Vector) -> Ve
 # =============================================================================
 
 
-def do_simplex(simplex: list[Point], direction: Vector) -> bool:
+def do_simplex(simplex: Sequence[Union[Point, Vector]], direction: Vector) -> bool:
+    simplex = list(simplex)
     s = len(simplex)
 
     if s < 2:
@@ -212,7 +220,7 @@ def is_collision_poly_poly_xy(A: Polygon, B: Polygon) -> bool:
     True
 
     """
-    direction = [1, 0, 0]
+    direction = Vector(1, 0, 0)
     point = support_poly_poly(A, B, direction)
     simplex = [point]
     direction = point * -1

src/compas_model/geometry/intersections.py

@@ -14,7 +14,13 @@
 # =============================================================================
 
 
-def is_line_contained_locally(point: Point, direction: Vector, dx: float, dy: float, dz: float) -> bool:
+def is_line_contained_locally(
+    point: Union[Point, Vector],
+    direction: Vector,
+    dx: float,
+    dy: float,
+    dz: float,
+) -> bool:
     """Determine whether the direction vector from a specific point is contained within the specified coordinate extents.
 
     Parameters
@@ -55,7 +61,11 @@ def is_line_contained_locally(point: Point, direction: Vector, dx: float, dy: fl
     return True
 
 
-def is_ray_contained_locally(point: Point, direction: Vector, extents: list[float]) -> bool:
+def is_ray_contained_locally(
+    point: Union[Point, Vector],
+    direction: Vector,
+    extents: list[float],
+) -> bool:
     """Determine whether a ray is contained within the given extents along local axes.
 
     Parameters
@@ -81,7 +91,12 @@ def is_ray_contained_locally(point: Point, direction: Vector, extents: list[floa
     return is_line_contained_locally(point, direction, *extents)
 
 
-def is_segment_contained_locally(point: Point, direction: Vector, box_extents: list[float], segment_extent: float) -> bool:
+def is_segment_contained_locally(
+    point: Union[Point, Vector],
+    direction: Vector,
+    box_extents: list[float],
+    segment_extent: float,
+) -> bool:
     """Determine whether a segment is contained within the given extents along local axes.
 
     Parameters
@@ -588,7 +603,7 @@ def is_clipped(denominator: float, numerator: float, t: list[float]) -> bool:
     return numerator <= 0
 
 
-def intersections_line_box_locally(point: Point, direction: Vector, extents: list[float]) -> tuple[int, list[Point]]:
+def intersections_line_box_locally(point: Union[Point, Vector], direction: Vector, extents: list[float]) -> tuple[int, list[float]]:
     t = [-inf, inf]
     dx, dy, dz = extents
 
@@ -616,7 +631,7 @@ def intersections_line_box_locally(point: Point, direction: Vector, extents: lis
     return count, t
 
 
-def intersections_ray_box_locally(point: Point, direction: Vector, extents: list[float]) -> tuple[int, list[Point]]:
+def intersections_ray_box_locally(point: Union[Point, Vector], direction: Vector, extents: list[float]) -> tuple[int, list[float]]:
     count, t = intersections_line_box_locally(point, direction, extents)
 
     if count > 0:

src/compas_model/geometry/minkowski3.py

@@ -1,6 +0,0 @@
-# points = []
-# for a in A:
-#     for b in B:
-#         points.append(Point(*(a + b)))
-# indices, lines = convex_hull_xy_numpy(points)
-# C = Polygon([points[i] for i in indices])

src/compas_model/materials/concrete.py

@@ -1,6 +1,7 @@
 from typing import Literal
 from typing import Optional
 
+from .errors import PropertyNotDefined
 from .material import Material
 
 
@@ -135,7 +136,9 @@ def nu(self) -> float:
 
     @property
     def G(self) -> float:
-        return self.Ecm / (2 * (1 + self.nu))
+        if self.Ecm:
+            return self.Ecm / (2 * (1 + self.nu))
+        raise PropertyNotDefined
 
     @classmethod
     def from_strength_class(cls, strength_class: Literal["C10", "C15", "C20", "C25", "C30", "C35"]) -> "Concrete":
@@ -151,8 +154,8 @@ def from_strength_class(cls, strength_class: Literal["C10", "C15", "C20", "C25",
         :class:`Concrete`
 
         """
-        strength_class = strength_class.upper()
-        if strength_class not in cls.STRENGTH_CLASSES:
-            raise ValueError("Strength class not supported: {}".format(strength_class))
-        params = cls.STRENGTH_CLASSES[strength_class]
+        strength_class_upper = strength_class.upper()
+        if strength_class_upper not in cls.STRENGTH_CLASSES:
+            raise ValueError("Strength class not supported: {}".format(strength_class_upper))
+        params = cls.STRENGTH_CLASSES[strength_class_upper]
         return cls(**params)

src/compas_model/materials/errors.py

@@ -0,0 +1,2 @@
+class PropertyNotDefined(Exception):
+    pass

src/compas_model/materials/steel.py

@@ -6,10 +6,22 @@
 
 class Steel(Material):
     STRENGTH_CLASSES: dict[str, dict[str, float]] = {
-        "S235": {"fy": 235, "fu": 360},
-        "S275": {"fy": 275, "fu": 430},
-        "S355": {"fy": 355, "fu": 490},
-        "S450": {"fy": 450, "fu": 550},
+        "S235": {
+            "fy": 235,
+            "fu": 360,
+        },
+        "S275": {
+            "fy": 275,
+            "fu": 430,
+        },
+        "S355": {
+            "fy": 355,
+            "fu": 490,
+        },
+        "S450": {
+            "fy": 450,
+            "fu": 550,
+        },
     }
 
     @property
@@ -58,8 +70,8 @@ def from_strength_class(cls, strength_class: Literal["S235", "S275", "S355", "S4
         :class:`Steel`
 
         """
-        strength_class = strength_class.upper()
-        if strength_class not in cls.STRENGTH_CLASSES:
-            raise ValueError("This strength class is not supported: {}".format(strength_class))
-        params = cls.STRENGTH_CLASSES[strength_class]
-        return cls(**params)
+        strength_class_upper = strength_class.upper()
+        if strength_class_upper not in cls.STRENGTH_CLASSES:
+            raise ValueError("This strength class is not supported: {}".format(strength_class_upper))
+        params = cls.STRENGTH_CLASSES[strength_class_upper]
+        return cls(**params)  # type: ignore