Add an InflationGrader (WIP)

Author: FranzBangar

examples/operation/extrude.py

@@ -7,18 +7,24 @@
 extrude = cb.Extrude(base, [0.5, 0.5, 3])
 
 # direction of corners 0-1
-extrude.chop(0, length_ratio=0.5, start_size=0.02, c2c_expansion=1.2)
-extrude.chop(0, length_ratio=0.5, end_size=0.02, c2c_expansion=1 / 1.2)
+# extrude.chop(0, length_ratio=0.5, start_size=0.02, c2c_expansion=1.2)
+# extrude.chop(0, length_ratio=0.5, end_size=0.02, c2c_expansion=1 / 1.2)
 
 # direction of corners 1-2
-extrude.chop(1, length_ratio=0.5, start_size=0.02, c2c_expansion=1.2)
-extrude.chop(1, length_ratio=0.5, end_size=0.02, c2c_expansion=1 / 1.2)
+# extrude.chop(1, length_ratio=0.5, start_size=0.02, c2c_expansion=1.2)
+# extrude.chop(1, length_ratio=0.5, end_size=0.02, c2c_expansion=1 / 1.2)
 
 # extrude direction
-extrude.chop(2, c2c_expansion=1, count=20)
+# extrude.chop(2, c2c_expansion=1, count=20)
+
+extrude.set_patch("bottom", "wall")
+
 
 mesh = cb.Mesh()
 mesh.add(extrude)
-mesh.set_default_patch("walls", "wall")
+mesh.set_default_patch("air", "patch")
+mesh.modify_patch("wall", "wall")
+grader = cb.InflationGrader(mesh, 0.01, 0.1)
+grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"))

src/classy_blocks/__init__.py

@@ -34,7 +34,9 @@
 from .construct.shapes.shell import Shell
 from .construct.shapes.sphere import EighthSphere, Hemisphere, QuarterSphere
 from .construct.stack import ExtrudedStack, RevolvedStack, TransformedStack
-from .grading.graders.fixed import FixedCountGrader, SimpleGrader
+from .grading.graders.fixed import FixedCountGrader
+from .grading.graders.inflation import InflationGrader
+from .grading.graders.simple import SimpleGrader
 from .mesh import Mesh
 from .modify.find.geometric import GeometricFinder
 from .modify.find.shape import RoundSolidFinder
@@ -77,6 +79,7 @@
     "HalfSplineDisk",
     "HalfSplineRing",
     "Hemisphere",
+    "InflationGrader",
     "LJoint",
     "LineClamp",
     "LineCurve",

src/classy_blocks/grading/analyze/probe.py

@@ -126,6 +126,7 @@ def find_patch(orient: OrientType) -> bool:
                 return False
 
             vertices = set(block.get_side_vertices(orient))
+
             try:
                 patch = self.dump.patch_list.find(vertices)
                 if patch.kind == "wall":

src/classy_blocks/grading/graders/auto.py

@@ -0,0 +1,24 @@
+import abc
+
+import numpy as np
+
+from classy_blocks.cbtyping import ChopTakeType
+from classy_blocks.grading.analyze.row import Row
+
+
+class AutoGraderMixin(abc.ABC):
+    take: ChopTakeType
+
+    def _get_row_length(self, row: Row) -> float:
+        lengths = []
+
+        for entry in row.entries:
+            lengths += entry.lengths
+
+        if self.take == "max":
+            return max(lengths)
+
+        if self.take == "min":
+            return min(lengths)
+
+        return float(np.average(np.array(lengths)))

src/classy_blocks/grading/graders/fixed.py

@@ -1,9 +1,8 @@
-import numpy as np
-
 from classy_blocks.assemble.dump import AssembledDump
-from classy_blocks.cbtyping import ChopTakeType, DirectionType
+from classy_blocks.cbtyping import DirectionType
 from classy_blocks.grading.analyze.row import Row
 from classy_blocks.grading.define.chop import Chop
+from classy_blocks.grading.graders.auto import AutoGraderMixin
 from classy_blocks.grading.graders.manager import AxisGrader, GradingManager
 from classy_blocks.items.block import Block
 from classy_blocks.mesh import Mesh
@@ -18,9 +17,7 @@ def get_chops(self):
         return [Chop(count=self.count)]
 
 
-class FixedCountGrader(GradingManager):
-    axis_grader = FixedAxisGrader
-
+class FixedCountGrader(GradingManager, AutoGraderMixin):
     def __init__(self, mesh: Mesh, count: int = 5):
         self.count = count
         mesh.assemble()
@@ -36,38 +33,3 @@ def _grade_row(self, row: Row):
             entry = row.entries[0]
             axis_grader = FixedAxisGrader(entry.block, entry.heading, self.count)
             axis_grader.grade()
-
-
-class SimpleGrader(GradingManager):
-    def __init__(self, mesh: Mesh, cell_size: float, take: ChopTakeType = "avg"):
-        self.cell_size = cell_size
-        self.take = take
-        mesh.assemble()
-
-        assert isinstance(mesh.dump, AssembledDump)
-
-        super().__init__(mesh.dump, mesh.settings)
-
-    def _get_row_count(self, row: Row):
-        lengths = []
-
-        for entry in row.entries:
-            lengths += entry.lengths
-
-        if self.take == "max":
-            ref_len = max(lengths)
-
-        elif self.take == "min":
-            ref_len = min(lengths)
-        else:
-            ref_len = np.average(np.array(lengths))
-
-        return max(1, int(ref_len / self.cell_size))
-
-    def _grade_row(self, row: Row):
-        super()._grade_row(row)
-
-        if row.count == 0:
-            entry = row.entries[0]
-            axis_grader = FixedAxisGrader(entry.block, entry.heading, self._get_row_count(row))
-            axis_grader.grade()