Update tools and satisfy them

Rename 'types' to 'cbtyping';
Rename array to 'series'

Fix bug #60
Fix bug #70
Fix bug #63

Author: FranzBangar

examples/complex/cyclone/geometry.py

@@ -16,7 +16,7 @@
 )
 
 from classy_blocks.base.exceptions import GeometryConstraintError
-from classy_blocks.types import NPPointType
+from classy_blocks.cbtyping import NPPointType
 from classy_blocks.util import functions as f
 from classy_blocks.util.constants import vector_format as fvect
 

examples/complex/cyclone/regions/core.py

@@ -6,9 +6,9 @@
 
 import classy_blocks as cb
 from classy_blocks.base.transforms import Transformation, Translation
+from classy_blocks.cbtyping import NPVectorType, PointListType, PointType
 from classy_blocks.construct.point import Point
 from classy_blocks.construct.shapes.round import RoundSolidShape
-from classy_blocks.types import NPVectorType, PointListType, PointType
 
 
 class NineCoreDisk(cb.MappedSketch):

examples/complex/cyclone/regions/pipe.py

@@ -5,7 +5,7 @@
 from regions.region import Region
 
 import classy_blocks as cb
-from classy_blocks.types import NPPointType
+from classy_blocks.cbtyping import NPPointType
 from classy_blocks.util import functions as f
 
 

examples/complex/cyclone/regions/skirt.py

@@ -1,9 +1,8 @@
-from typing import List, Set
+from typing import List
 
 from regions.region import Region
 
 import classy_blocks as cb
-from classy_blocks.optimize.clamps.clamp import ClampBase
 
 
 class Skirt(Region):

examples/shape/custom.py

@@ -3,7 +3,7 @@
 import numpy as np
 
 import classy_blocks as cb
-from classy_blocks.types import PointType
+from classy_blocks.cbtyping import PointType
 from classy_blocks.util import functions as f
 
 # an example with a custom sketch, yielding a custom shape (square with rounded corners);

examples/shape/cylinder.py

@@ -17,7 +17,7 @@
 cylinder.set_start_patch("inlet")
 cylinder.set_end_patch("outlet")
 cylinder.set_outer_patch("walls")
-cylinder.set_symmetry_patch('sym')
+cylinder.set_symmetry_patch("sym")
 
 # if curved core edges get in the way (when moving vertices, optimization, ...),
 # remove them with this method:

pyproject.toml

@@ -31,10 +31,7 @@ src_paths = ["src", "tests"]
 [tool.ruff]
 target-version = "py38"
 line-length = 120
-
-[tool.ruff.lint]
 select = ["E", "F", "N", "UP", "YTT", "B", "A", "ARG", "RUF"]
-ignore = ["RUF022"]
 
 [[tool.mypy.overrides]]
 module = "scipy,scipy.*,parameterized.*"

src/classy_blocks/__init__.py

@@ -45,96 +45,82 @@
 from .optimize.smoother import MeshSmoother, SketchSmoother
 
 __all__ = [
-    # Base
-    "Mirror",
-    "Rotation",
-    "Scaling",
-    "Translation",
-    "Shear",
-    # curves
-    "CurveBase",
-    "DiscreteCurve",
-    "LinearInterpolatedCurve",
-    "SplineInterpolatedCurve",
     "AnalyticCurve",
-    "LineCurve",
-    "CircleCurve",
-    # edges
-    "Arc",
-    "Origin",
     "Angle",
-    "Spline",
-    "PolyLine",
-    "Project",
-    "OnCurve",
-    # Face
-    "Face",
-    # construct operations
-    "Operation",
-    "Loft",
-    "Extrude",
-    "Revolve",
+    "Arc",
     "Box",
-    "Wedge",
+    "CircleCurve",
+    "ClampBase",
     "Connector",
-    # Sketches
-    "MappedSketch",
-    "Grid",
-    "OneCoreDisk",
+    "CurveBase",
+    "CurveClamp",
+    "Cylinder",
+    "DiscreteCurve",
+    "Elbow",
+    "Extrude",
+    "ExtrudedRing",
+    "ExtrudedShape",
+    "ExtrudedStack",
+    "Face",
     "FourCoreDisk",
+    "FreeClamp",
+    "Frustum",
+    "GeometricFinder",
+    "Grid",
     "HalfDisk",
-    "WrappedDisk",
-    "Oval",
-    "QuarterSplineDisk",
     "HalfSplineDisk",
-    "SplineDisk",
-    "QuarterSplineRing",
     "HalfSplineRing",
-    "SplineRing",
-    # construct shapes
-    "Shape",
-    "ExtrudedShape",
-    "LoftedShape",
-    "RevolvedShape",
-    "Elbow",
-    "Frustum",
-    "Cylinder",
-    "SemiCylinder",
-    "QuarterCylinder",
-    "ExtrudedRing",
-    "RevolvedRing",
     "Hemisphere",
-    "Shell",
-    # Stacks
-    "TransformedStack",
-    "ExtrudedStack",
-    "RevolvedStack",
-    # The Mesh
-    "Mesh",
-    # Modification
-    "GeometricFinder",
-    "RoundSolidFinder",
-    "ViewpointReorienter",
-    # Optimization: Clamps
-    "ClampBase",
-    "FreeClamp",
+    "LJoint",
     "LineClamp",
-    "CurveClamp",
-    "RadialClamp",
+    "LineCurve",
+    "LinearInterpolatedCurve",
+    "LinkBase",
+    "Loft",
+    "LoftedShape",
+    "MappedSketch",
+    "Mesh",
+    "MeshOptimizer",
+    "MeshSmoother",
+    "Mirror",
+    "NJoint",
+    "OnCurve",
+    "OneCoreDisk",
+    "Operation",
+    "Origin",
+    "Oval",
     "ParametricSurfaceClamp",
     "PlaneClamp",
-    # Optimization: links
-    "LinkBase",
-    "TranslationLink",
+    "PolyLine",
+    "Project",
+    "QuarterCylinder",
+    "QuarterSplineDisk",
+    "QuarterSplineRing",
+    "RadialClamp",
+    "Revolve",
+    "RevolvedRing",
+    "RevolvedShape",
+    "RevolvedStack",
+    "Rotation",
     "RotationLink",
-    "SymmetryLink",
-    # Optimization: optimizers and smoothers
-    "MeshOptimizer",
+    "RoundSolidFinder",
+    "Scaling",
+    "SemiCylinder",
+    "Shape",
+    "Shear",
+    "Shell",
     "SketchOptimizer",
-    "MeshSmoother",
     "SketchSmoother",
-    # Assemblies
-    "NJoint",
+    "Spline",
+    "SplineDisk",
+    "SplineInterpolatedCurve",
+    "SplineRing",
+    "SymmetryLink",
     "TJoint",
-    "LJoint",
+    "TransformedStack",
+    "Translation",
+    "TranslationLink",
+    "ViewpointReorienter",
+    "Wedge",
+    "WrappedDisk",
 ]

src/classy_blocks/base/element.py

@@ -3,7 +3,7 @@
 from typing import Dict, List, Optional, Sequence, TypeVar
 
 from classy_blocks.base import transforms as tr
-from classy_blocks.types import NPPointType, PointType, VectorType
+from classy_blocks.cbtyping import NPPointType, PointType, VectorType
 
 ElementBaseT = TypeVar("ElementBaseT", bound="ElementBase")
 

src/classy_blocks/base/transforms.py

@@ -4,7 +4,7 @@
 import dataclasses
 from typing import Optional
 
-from classy_blocks.types import PointType, VectorType
+from classy_blocks.cbtyping import PointType, VectorType
 
 
 @dataclasses.dataclass