Merge branch 'feature/autochop' of github.com:damogranlabs/classy_blo…

…cks into feature/autochop

examples/advanced/autograding_highre.py

@@ -2,7 +2,6 @@
 
 import classy_blocks as cb
 from classy_blocks.grading.autograding.grader import HighReGrader
-from classy_blocks.grading.autograding.params import HighReChopParams
 
 mesh = cb.Mesh()
 
@@ -19,18 +18,12 @@
     vertex = list(finder.find_in_sphere(point))[0]
     vertex.translate([0, 0.8, 0])
 
-# TODO! Un-hack
-mesh.block_list.update()
-
 mesh.set_default_patch("walls", "wall")
 
+# TODO: Hack! mesh.assemble() won't work here but wires et. al. must be updated
+mesh.block_list.update()
 
-params = HighReChopParams(0.05)
-grader = HighReGrader(mesh, params)
+grader = HighReGrader(mesh, 0.05)
 grader.grade()
 
-# params = SimpleChopParams(0.05)
-# grader = SimpleGrader(mesh, params)
-# grader.grade(take="max")
-
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/chaining/labyrinth.py

@@ -3,7 +3,6 @@
 
 import classy_blocks as cb
 from classy_blocks.grading.autograding.grader import FixedCountGrader
-from classy_blocks.grading.autograding.params import FixedCountParams
 from classy_blocks.util import functions as f
 
 mesh = cb.Mesh()
@@ -35,7 +34,7 @@
 
 mesh.set_default_patch("walls", "wall")
 
-grader = FixedCountGrader(mesh, FixedCountParams(5))
+grader = FixedCountGrader(mesh, 5)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/chaining/tank.py

@@ -2,7 +2,6 @@
 
 import classy_blocks as cb
 from classy_blocks.grading.autograding.grader import SimpleGrader
-from classy_blocks.grading.autograding.params import SimpleChopParams
 
 # a cylindrical tank with round end caps
 diameter = 0.5
@@ -26,8 +25,7 @@
 mesh.add(start_cap)
 mesh.add(end_cap)
 
-params = SimpleChopParams(0.05)
-grader = SimpleGrader(mesh, params)
+grader = SimpleGrader(mesh, 0.05)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/complex/cyclone/geometry.py

@@ -15,15 +15,12 @@
     T_PIPE,
 )
 
+from classy_blocks.base.exceptions import GeometryConstraintError
 from classy_blocks.types import NPPointType
 from classy_blocks.util import functions as f
 from classy_blocks.util.constants import vector_format as fvect
 
 
-class GeometryConstraintError(Exception):
-    """Raised when input parameters produce an invalid geometry"""
-
-
 @dataclasses.dataclass
 class Geometry:
     """Holds user-provided parameters and conversions to SI units;

examples/shape/custom.py

@@ -4,7 +4,6 @@
 
 import classy_blocks as cb
 from classy_blocks.grading.autograding.grader import HighReGrader
-from classy_blocks.grading.autograding.params import HighReChopParams
 from classy_blocks.types import PointType
 from classy_blocks.util import functions as f
 
@@ -63,15 +62,10 @@ def add_edges(self) -> None:
 
 shape = cb.ExtrudedShape(base_1, 1)
 
-# for op in shape.operations:
-#     for i in range(3):
-#         op.chop(i, count=10)
 mesh.add(shape)
 mesh.assemble()
-mesh.block_list.update()
 
-params = HighReChopParams(0.03)
-grader = HighReGrader(mesh, params)
+grader = HighReGrader(mesh, 0.03)
 grader.grade(take="max")
 
 mesh.set_default_patch("walls", "wall")

examples/shape/cylinder.py

@@ -3,7 +3,6 @@
 import classy_blocks as cb
 from classy_blocks.construct.flat.sketches.disk import DiskBase
 from classy_blocks.grading.autograding.grader import HighReGrader
-from classy_blocks.grading.autograding.params import HighReChopParams
 
 DiskBase.core_ratio = 0.4  # Default is 0.8
 
@@ -26,6 +25,7 @@
 bl_thickness = 0.05
 core_size = 0.2
 
+# manual grading
 # cylinder.chop_axial(count=30)
 # cylinder.chop_radial(start_size=core_size, end_size=bl_thickness)
 # cylinder.chop_tangential(start_size=core_size)
@@ -35,9 +35,8 @@
 mesh.assemble()
 mesh.block_list.update()
 
-params = HighReChopParams(0.1)
-grader = HighReGrader(mesh, params)
+# automatic grading
+grader = HighReGrader(mesh, 0.1)
 grader.grade()
 
-
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/shape/quarter_cylinder.py

@@ -3,7 +3,6 @@
 import classy_blocks as cb
 from classy_blocks.construct.flat.sketches.disk import QuarterDisk
 from classy_blocks.grading.autograding.grader import HighReGrader
-from classy_blocks.grading.autograding.params import HighReChopParams
 from classy_blocks.util import functions as f
 
 mesh = cb.Mesh()
@@ -21,12 +20,9 @@
 mesh.add(quarter_cylinder)
 
 mesh.assemble()
-# TODO: automate or something
-mesh.block_list.update()
 
-params = HighReChopParams(0.05)
-grader = HighReGrader(mesh, params)
+grader = HighReGrader(mesh, 0.05)
 grader.grade()
 
-
+mesh.set_default_patch("walls", "wall")
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

src/classy_blocks/base/exceptions.py

@@ -1,27 +1,7 @@
 from typing import Optional
 
 
-class VertexNotFoundError(Exception):
-    """Raised when a vertex at a given point in space doesn't exist yet"""
-
-
-class EdgeNotFoundError(Exception):
-    """Raised when an edge between a given pair of vertices doesn't exist yet"""
-
-
-class CornerPairError(Exception):
-    """Raised when given pair of corners is not valid (for example, edge between 0 and 2)"""
-
-
-class UndefinedGradingsError(Exception):
-    """Raised when the user hasn't supplied enough grading data to
-    define all blocks in the mesh"""
-
-
-class InconsistentGradingsError(Exception):
-    """Raised when cell counts for edges on the same axis is not consistent"""
-
-
+### Construction
 class ShapeCreationError(Exception):
     """Base class for shape creation errors (invalid parameters/types to
     shape constructors)"""
@@ -75,3 +55,80 @@ class FrustumCreationError(ShapeCreationError):
 
 class ExtrudedRingCreationError(ShapeCreationError):
     pass
+
+
+class GeometryConstraintError(Exception):
+    """Raised when input parameters produce an invalid geometry"""
+
+
+class DegenerateGeometryError(Exception):
+    """Raised when orienting failed because of invalid geometry"""
+
+
+# Shell/offsetting logic
+class SharedPointError(Exception):
+    """Errors with shared points"""
+
+
+class SharedPointNotFoundError(SharedPointError):
+    pass
+
+
+class PointNotCoincidentError(SharedPointError):
+    pass
+
+
+class DisconnectedChopError(SharedPointError):
+    """Issued when chopping a Shell that has disconnected faces"""
+
+
+### Search/retrieval
+class VertexNotFoundError(Exception):
+    """Raised when a vertex at a given point in space doesn't exist yet"""
+
+
+class EdgeNotFoundError(Exception):
+    """Raised when an edge between a given pair of vertices doesn't exist yet"""
+
+
+class CornerPairError(Exception):
+    """Raised when given pair of corners is not valid (for example, edge between 0 and 2)"""
+
+
+### Grading
+class UndefinedGradingsError(Exception):
+    """Raised when the user hasn't supplied enough grading data to
+    define all blocks in the mesh"""
+
+
+class InconsistentGradingsError(Exception):
+    """Raised when cell counts for edges on the same axis is not consistent"""
+
+
+class NoInstructionError(Exception):
+    """Raised when building a catalogue"""
+
+
+class BlockNotFoundError(Exception):
+    """Raised when building a catalogue"""
+
+
+### Optimization
+class NoClampError(Exception):
+    """Raised when there's no junction defined for a given Clamp"""
+
+
+class ClampExistsError(Exception):
+    """Raised when adding a clamp to a junction that already has one defined"""
+
+
+class NoCommonSidesError(Exception):
+    """Raised when two cells don't share a side"""
+
+
+class NoJunctionError(Exception):
+    """Raised when there's a clamp defined for a vertex that doesn't exist"""
+
+
+class InvalidLinkError(Exception):
+    """Raised when a link has been added that doesn't connect two actual points"""

src/classy_blocks/construct/shape.py

@@ -6,6 +6,7 @@
 import numpy as np
 
 from classy_blocks.base.element import ElementBase
+from classy_blocks.base.exceptions import ShapeCreationError
 from classy_blocks.construct.edges import Angle
 from classy_blocks.construct.flat.sketch import Sketch, SketchT
 from classy_blocks.construct.operations.loft import Loft
@@ -16,10 +17,6 @@
 ShapeT = TypeVar("ShapeT", bound="Shape")
 
 
-class ShapeCreationError(Exception):
-    """Raised when creating a shape from errorneous data"""
-
-
 class Shape(ElementBase, abc.ABC):
     """A collection of Operations that form a predefined
     parametric shape"""

src/classy_blocks/construct/shapes/shell.py

@@ -3,6 +3,7 @@
 
 import numpy as np
 
+from classy_blocks.base.exceptions import DisconnectedChopError, PointNotCoincidentError, SharedPointNotFoundError
 from classy_blocks.construct.flat.face import Face
 from classy_blocks.construct.operations.loft import Loft
 from classy_blocks.construct.point import Point
@@ -11,22 +12,6 @@
 from classy_blocks.util import functions as f
 
 
-class SharedPointError(Exception):
-    """Errors with shared points"""
-
-
-class SharedPointNotFoundError(SharedPointError):
-    pass
-
-
-class PointNotCoincidentError(SharedPointError):
-    pass
-
-
-class DisconnectedChopError(SharedPointError):
-    """Issued when chopping a Shell that has disconnected faces"""
-
-
 class SharedPoint:
     """A Point with knowledge of its "owner" Face(s)"""
 

src/classy_blocks/grading/autograding/grader.py

@@ -70,8 +70,8 @@ class FixedCountGrader(GraderBase):
 
     stages = 1
 
-    def __init__(self, mesh: Mesh, params: FixedCountParams):
-        super().__init__(mesh, params)
+    def __init__(self, mesh: Mesh, count: int = 8):
+        super().__init__(mesh, FixedCountParams(count))
 
 
 class SimpleGrader(GraderBase):
@@ -81,8 +81,8 @@ class SimpleGrader(GraderBase):
 
     stages = 1
 
-    def __init__(self, mesh: Mesh, params: SimpleChopParams):
-        super().__init__(mesh, params)
+    def __init__(self, mesh: Mesh, cell_size: float):
+        super().__init__(mesh, SimpleChopParams(cell_size))
 
 
 class HighReGrader(GraderBase):
@@ -93,5 +93,5 @@ class HighReGrader(GraderBase):
 
     stages = 3
 
-    def __init__(self, mesh: Mesh, params: HighReChopParams):
-        super().__init__(mesh, params)
+    def __init__(self, mesh: Mesh, cell_size: float):
+        super().__init__(mesh, HighReChopParams(cell_size))