Add tests

Author: FranzBangar

src/classy_blocks/__init__.py

@@ -1,6 +1,7 @@
-from .base.transforms import Mirror, Rotation, Scaling, Translation
+from .base.transforms import Mirror, Rotation, Scaling, Shear, Translation
 from .construct.assemblies.joints import LJoint, NJoint, TJoint
 from .construct.curves.analytic import AnalyticCurve, CircleCurve, LineCurve
+from .construct.curves.curve import CurveBase
 from .construct.curves.discrete import DiscreteCurve
 from .construct.curves.interpolated import LinearInterpolatedCurve, SplineInterpolatedCurve
 from .construct.edges import Angle, Arc, OnCurve, Origin, PolyLine, Project, Spline
@@ -41,7 +42,9 @@
     "Rotation",
     "Scaling",
     "Translation",
+    "Shear",
     # curves
+    "CurveBase",
     "DiscreteCurve",
     "LinearInterpolatedCurve",
     "SplineInterpolatedCurve",
@@ -56,6 +59,7 @@
     "PolyLine",
     "Project",
     "OnCurve",
+    # Face
     "Face",
     # construct operations
     "Operation",
@@ -92,9 +96,10 @@
     "RevolvedStack",
     # The Mesh
     "Mesh",
-    # Modification of assembled meshes
+    # Modification
     "GeometricFinder",
     "RoundSolidFinder",
+    "ViewpointReorienter",
     # Optimization: Clamps
     "ClampBase",
     "FreeClamp",
@@ -113,7 +118,6 @@
     "SketchOptimizer",
     "MeshSmoother",
     "SketchSmoother",
-    "ViewpointReorienter",
     # Assemblies
     "NJoint",
     "TJoint",

src/classy_blocks/construct/assemblies/joints.py

@@ -114,6 +114,11 @@ def __init__(self, start_point: PointType, center_point: PointType, radius_point
     def _get_angles(self, count: int) -> FloatListType:
         """Returns angles at which CuspCylinders must be rotated"""
 
+    @property
+    def center(self):
+        # "center" is the start point
+        return self.shapes[0].operations[0].top_face.points[0].position
+
     def chop_axial(self, **kwargs):
         for asm in self.assemblies:
             asm.chop_axial(**kwargs)
@@ -139,10 +144,16 @@ def _get_angles(self, count):
 
 
 class TJoint(JointBase):
+    def __init__(self, start_point: PointType, center_point: PointType, radius_point: PointType):
+        super().__init__(start_point, center_point, radius_point)
+
     def _get_angles(self, _):
         return [0, np.pi / 2, 3 * np.pi / 2]
 
 
 class LJoint(JointBase):
+    def __init__(self, start_point: PointType, center_point: PointType, radius_point: PointType):
+        super().__init__(start_point, center_point, radius_point)
+
     def _get_angles(self, _):
         return [0, np.pi / 2]

tests/test_construct/test_assembly.py

@@ -0,0 +1,88 @@
+import unittest
+
+import numpy as np
+from parameterized import parameterized
+
+from classy_blocks.construct.assemblies.joints import JointBase, LJoint, NJoint, TJoint
+from classy_blocks.mesh import Mesh
+from classy_blocks.types import NPPointListType
+from classy_blocks.util import functions as f
+
+
+class AssemblyTests(unittest.TestCase):
+    def setUp(self):
+        self.center_point = [0, 0, 0]
+        self.start_point = [0, -1, 0]
+        self.radius_point = [0, -1, 0.3]
+
+    def fanout(self, count: int) -> NPPointListType:
+        angles = np.linspace(0, 2 * np.pi, num=count, endpoint=False)
+
+        return np.array([f.rotate(self.start_point, angle, [0, 0, 1], self.center_point) for angle in angles])
+
+    def get_joint_points(self, joint: JointBase) -> NPPointListType:
+        points = []
+
+        for i, shape in enumerate(joint.shapes):
+            if i % 2 == 0:
+                points.append(shape.operations[0].bottom_face.points[0].position)
+
+        return np.array(points)
+
+    def test_t_joint(self):
+        joint = TJoint(self.start_point, self.center_point, self.radius_point)
+
+        joint_points = self.get_joint_points(joint)
+        expected_points = np.take(self.fanout(4), (0, 1, 3), axis=0)
+
+        np.testing.assert_almost_equal(joint_points, expected_points)
+
+    def test_l_joint(self):
+        joint = LJoint(self.start_point, self.center_point, self.radius_point)
+
+        joint_points = self.get_joint_points(joint)
+        expected_points = np.take(self.fanout(4), (0, 1), axis=0)
+
+        np.testing.assert_almost_equal(joint_points, expected_points)
+
+    @parameterized.expand(((3,), (4,), (5,), (6,)))
+    def test_n_joint(self, branches):
+        joint = NJoint(self.start_point, self.center_point, self.radius_point, branches=branches)
+
+        joint_points = self.get_joint_points(joint)
+        expected_points = self.fanout(branches)
+
+        np.testing.assert_almost_equal(joint_points, expected_points)
+
+    def test_operations(self):
+        joint = NJoint(self.start_point, self.center_point, self.radius_point, branches=3)
+
+        self.assertEqual(len(joint.operations), 3 * 2 * 6)
+
+    def test_center(self):
+        joint = NJoint(self.start_point, self.center_point, self.radius_point, branches=3)
+
+        np.testing.assert_equal(joint.center, self.center_point)
+
+    def test_chop(self):
+        mesh = Mesh()
+        joint = TJoint(self.start_point, self.center_point, self.radius_point)
+
+        cell_size = 0.1
+        joint.chop_axial(start_size=cell_size)
+        joint.chop_radial(start_size=cell_size)
+        joint.chop_tangential(start_size=cell_size)
+
+        mesh.add(joint)
+        mesh.assemble()
+        mesh.block_list.propagate_gradings()
+
+    def test_set_patches(self):
+        branches = 5
+
+        joint = NJoint(self.start_point, self.center_point, self.radius_point, branches)
+
+        joint.set_outer_patch("walls")
+
+        for i in range(branches):
+            joint.set_hole_patch(i, f"outlet_{i}")

tests/test_construct/test_shape.py

@@ -3,6 +3,7 @@
 import numpy as np
 
 from classy_blocks.base.exceptions import CylinderCreationError, FrustumCreationError
+from classy_blocks.construct.edges import Line
 from classy_blocks.construct.flat.face import Face
 from classy_blocks.construct.flat.sketches.disk import Disk, OneCoreDisk
 from classy_blocks.construct.shape import ExtrudedShape, LoftedShape, RevolvedShape, ShapeCreationError
@@ -290,6 +291,16 @@ def test_mirror(self):
             cyl_2.sketch_2.center - cyl_2.sketch_1.center, cyl_1.sketch_1.center - cyl_1.sketch_2.center
         )
 
+    def test_remove_inner_edges(self):
+        cylinder = self.cylinder
+        cylinder.remove_inner_edges()
+
+        for operation in cylinder.core:
+            for edge in operation.bottom_face.edges:
+                self.assertIsInstance(edge, Line)
+            for edge in operation.top_face.edges:
+                self.assertIsInstance(edge, Line)
+
 
 class LoftedShapeTests(unittest.TestCase):
     @property

tests/test_util/test_imports.py

@@ -11,18 +11,17 @@ def test_import_transforms(self):
         _ = cb.Rotation
         _ = cb.Scaling
         _ = cb.Mirror
+        _ = cb.Shear
 
     def test_import_curves(self):
+        _ = cb.CurveBase
         _ = cb.DiscreteCurve
         _ = cb.LinearInterpolatedCurve
         _ = cb.SplineInterpolatedCurve
         _ = cb.AnalyticCurve
         _ = cb.LineCurve
         _ = cb.CircleCurve
 
-    def test_import_flat(self):
-        _ = cb.Face
-
     def test_import_edges(self):
         _ = cb.Arc
         _ = cb.Angle
@@ -32,6 +31,9 @@ def test_import_edges(self):
         _ = cb.Project
         _ = cb.OnCurve
 
+    def test_import_flat(self):
+        _ = cb.Face
+
     def test_import_operations(self):
         _ = cb.Loft
         _ = cb.Box
@@ -43,8 +45,6 @@ def test_import_operations(self):
     def test_import_sketches(self):
         _ = cb.MappedSketch
         _ = cb.Grid
-        _ = cb.Oval
-        _ = cb.Grid
         _ = cb.OneCoreDisk
         _ = cb.FourCoreDisk
         _ = cb.HalfDisk
@@ -57,10 +57,14 @@ def test_import_stacks(self):
         _ = cb.RevolvedStack
 
     def test_import_shapes(self):
+        _ = cb.Shape
+        _ = cb.ExtrudedShape
+        _ = cb.LoftedShape
+        _ = cb.RevolvedShape
         _ = cb.Elbow
         _ = cb.Frustum
-        _ = cb.SemiCylinder
         _ = cb.Cylinder
+        _ = cb.SemiCylinder
         _ = cb.ExtrudedRing
         _ = cb.RevolvedRing
         _ = cb.Hemisphere
@@ -84,6 +88,15 @@ def test_import_links(self):
         _ = cb.LinkBase
         _ = cb.TranslationLink
         _ = cb.RotationLink
+        _ = cb.SymmetryLink
 
     def test_import_optimizer(self):
         _ = cb.MeshOptimizer
+        _ = cb.SketchOptimizer
+        _ = cb.MeshSmoother
+        _ = cb.SketchSmoother
+
+    def test_import_assemblies(self):
+        _ = cb.NJoint
+        _ = cb.TJoint
+        _ = cb.LJoint