typing

Author: tomvanmele

src/compas_dem/interactions/contact.py

@@ -1,4 +1,6 @@
 from typing import Annotated
+from typing import Optional
+from typing import Union
 
 from compas.geometry import Frame
 from compas.geometry import Line
@@ -93,7 +95,7 @@ def __init__(self, forces=None, **kwargs):
 
         self._points2 = None
         self._polygon2 = None
-        self._forces = forces
+        self._forces = forces or []
 
         self._compressiondata = None
         self._tensiondata = None
@@ -131,7 +133,7 @@ def M0(self) -> float:
         m0 = 0
         for a, b in pairwise(self.points2 + self.points2[:1]):
             d = b - a
-            n = [d[1], -d[0], 0]
+            n = [d[1], -d[0], 0]  # type: ignore
             m0 += dot_vectors(a, n)
         return 0.5 * m0
 
@@ -140,7 +142,7 @@ def M1(self) -> Point:
         m1 = Point(0, 0, 0)
         for a, b in pairwise(self.points2 + self.points2[:1]):
             d = b - a
-            n = [d[1], -d[0], 0]
+            n = [d[1], -d[0], 0]  # type: ignore
             m0 = dot_vectors(a, n)
             m1 += (a + b) * m0
         return m1 / 6
@@ -150,7 +152,7 @@ def M2(self) -> Annotated[list[Annotated[list[float], 3]], 3]:
         m2 = outer_product([0, 0, 0], [0, 0, 0])
         for a, b in pairwise(self.points2 + self.points2[:1]):
             d = b - a
-            n = [d[1], -d[0], 0]
+            n = [d[1], -d[0], 0]  # type: ignore
             m0 = dot_vectors(a, n)
             aa = outer_product(a, a)
             ab = outer_product(a, b)
@@ -163,7 +165,7 @@ def M2(self) -> Annotated[list[Annotated[list[float], 3]], 3]:
                     m0,
                 ),
             )
-        return scale_matrix(m2, 1 / 12.0)
+        return scale_matrix(m2, 1 / 12.0)  # type: ignore
 
     @property
     def kern(self):
@@ -267,7 +269,7 @@ def frictiondata(self) -> list[list[float]]:
         return self._frictiondata
 
     @property
-    def resultantpoint(self) -> list[float]:
+    def resultantpoint(self) -> Optional[Union[Point, list[float]]]:
         if not self.forces:
             return []
         normalcomponents = [f["c_np"] - f["c_nn"] for f in self.forces]
@@ -291,7 +293,7 @@ def resultantforce(self) -> list[Line]:
         return [Line(p1, p2)]
 
     @property
-    def resultantdata(self) -> list[float]:
+    def resultantdata(self) -> Optional[list[float]]:
         if not self._resultantdata:
             if self.forces:
                 normalcomponents = [f["c_np"] - f["c_nn"] for f in self.forces]

src/compas_dem/notebook/buffers.py

@@ -134,7 +134,7 @@ def mesh_to_facesbuffer(mesh: Mesh, color: Color) -> tuple[list[list[float]], li
             colors.append(color)
 
         else:
-            ears = earclip_polygon(Polygon([mesh.vertex_coordinates(v) for v in vertices]))
+            ears: list[list[int]] = earclip_polygon(Polygon([mesh.vertex_coordinates(v) for v in vertices]))  # type: ignore
             for ear in ears:
                 positions.append(mesh.vertex_coordinates(vertices[ear[0]]))
                 positions.append(mesh.vertex_coordinates(vertices[ear[1]]))

src/compas_dem/notebook/modelobject.py

@@ -1,4 +1,5 @@
 from typing import Optional
+from typing import Union
 
 import pythreejs as three
 from compas.colors import Color
@@ -40,7 +41,7 @@ def __init__(
 
     @property
     def model(self) -> BlockModel:
-        return self.item
+        return self.item  # type: ignore
 
     @model.setter
     def model(self, model: BlockModel) -> None:
@@ -77,7 +78,7 @@ def draw(self):
 
         return self.guids
 
-    def draw_blocks(self) -> tuple[three.Mesh, three.LineSegments]:
+    def draw_blocks(self) -> tuple[Union[three.Mesh, None], three.LineSegments]:
         """Draw the blocks of the model."""
         meshes = [block.modelgeometry for block in self.model.blocks()]