Fix a bug with collapsed grading specification

Author: FranzBangar

examples/advanced/collapsed.py

@@ -10,9 +10,13 @@
 loft = cb.Loft(bottom_face, top_face)
 extrude = cb.Extrude(top_face, 1)
 
+
+revolve_face = cb.Face([[2, 0, 0], [3, 0, 0], [3, 1, 0], [2, 1, 0]])
+revolve = cb.Revolve(revolve_face, 1, [1, 0, 0], [0, 0, 0])
+
 mesh.add(loft)
 mesh.add(extrude)
-
+mesh.add(revolve)
 mesh.assemble()
 
 # grader = cb.FixedCountGrader(mesh)
@@ -22,5 +26,6 @@
 for i in (0, 1, 2):
     loft.chop(i, count=5)
     extrude.chop(i, count=5)
+    revolve.chop(i, count=5)
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

src/classy_blocks/grading/define/grading.py

@@ -67,15 +67,9 @@ def clear(self) -> None:
         """Removes all added grading data"""
 
     @property
+    @abc.abstractmethod
     def chop_data(self) -> list[ChopData]:
-        if len(self._chop_data) < len(self.chops):
-            # Chops haven't been calculated yet
-            self._chop_data: list[ChopData] = []
-
-            for chop in self.chops:
-                self._chop_data.append(chop.calculate(self.length))
-
-        return self._chop_data
+        pass
 
     def get_specification(self, inverted: bool) -> list[GradingSpecType]:
         if inverted:
@@ -173,6 +167,17 @@ def __init__(self, length: float):
         # results from chop.calculate():
         self._chop_data: list[ChopData] = []
 
+    @property
+    def chop_data(self):
+        if len(self._chop_data) < len(self.chops):
+            # Chops haven't been calculated yet
+            self._chop_data: list[ChopData] = []
+
+            for chop in self.chops:
+                self._chop_data.append(chop.calculate(self.length))
+
+        return self._chop_data
+
     def add_chop(self, chop: Chop):
         super().add_chop(chop)
 
@@ -255,6 +260,10 @@ def add_chop(self, chop: Chop):
 
         self._count += chop.count
 
+    @property
+    def chop_data(self):
+        return [ChopData(1, 1, 1, self.count, 1, 1)]
+
     @property
     def count(self):
         return self._count
@@ -268,14 +277,7 @@ def clear(self):
 
     @property
     def description(self):
-        return str(self.count)
-
-    @classmethod
-    def from_grading(cls, source: GradingBase) -> "CollapsedGrading":
-        grading = cls()
-        grading.add_chop(Chop(count=source.count))
-
-        return grading
+        return "1"
 
     def __eq__(self, other):
         return self.count == other.count

tests/test_grading/test_grading.py

@@ -301,6 +301,5 @@ def test_clear(self):
     def test_description(self):
         g = CollapsedGrading()
         g.add_chop(Chop(count=10))
-        g.add_chop(Chop(count=20))
 
-        self.assertEqual(g.description, "30")
+        self.assertEqual(g.description, "1")