Delete mapper and replace its function with lookup registries

Author: FranzBangar

src/classy_blocks/lookup/cell_registry.py

@@ -3,6 +3,7 @@
 
 
 class CellRegistry:
+    # Works for both quads and hexas
     def __init__(self, addressing: list[IndexType]):
         self.addressing = addressing
 

src/classy_blocks/optimize/grid.py

@@ -18,12 +18,11 @@
     QuadConnectionRegistry,
 )
 from classy_blocks.lookup.face_registry import FaceRegistryBase, HexFaceRegistry, QuadFaceRegistry
-from classy_blocks.lookup.point_registry import HexPointRegistry
+from classy_blocks.lookup.point_registry import HexPointRegistry, QuadPointRegistry
 from classy_blocks.optimize.cell import CellBase, HexCell, QuadCell
 from classy_blocks.optimize.clamps.clamp import ClampBase
 from classy_blocks.optimize.junction import Junction
 from classy_blocks.optimize.links import LinkBase
-from classy_blocks.optimize.mapper import Mapper
 from classy_blocks.util import functions as f
 from classy_blocks.util.constants import TOL
 
@@ -153,18 +152,15 @@ class QuadGrid(GridBase):
     face_registry_class = QuadFaceRegistry
 
     @classmethod
-    def from_sketch(cls, sketch: Sketch) -> "QuadGrid":
+    def from_sketch(cls, sketch: Sketch, merge_tol: float = TOL) -> "QuadGrid":
         if isinstance(sketch, MappedSketch):
             # Use the mapper's indexes (provided by the user!)
             return cls(sketch.positions, sketch.indexes)
 
         # automatically create a mapping for arbitrary sketches
-        # TODO: replace Mapper with assemble.*registry, then delete the whole Mapper business
-        mapper = Mapper()
-        for face in sketch.faces:
-            mapper.add(face)
+        preg = QuadPointRegistry.from_sketch(sketch, merge_tol)
 
-        return cls(np.array(mapper.points), mapper.indexes)
+        return cls(preg.unique_points, preg.cell_addressing)
 
 
 class HexGrid(GridBase):

src/classy_blocks/optimize/mapper.py

@@ -13,7 +13,6 @@
 from classy_blocks.optimize.clamps.surface import PlaneClamp
 from classy_blocks.optimize.grid import GridBase, HexGrid, QuadGrid
 from classy_blocks.optimize.links import LinkBase
-from classy_blocks.optimize.mapper import Mapper
 from classy_blocks.optimize.record import (
     ClampRecord,
     IterationRecord,
@@ -208,19 +207,15 @@ def _backport(self):
 
 class ShapeOptimizer(OptimizerBase):
     def __init__(self, operations: list[Operation], report: bool = True, merge_tol: float = TOL):
-        self.mapper = Mapper(merge_tol)
-
-        for operation in operations:
-            self.mapper.add(operation)
-
-        grid = HexGrid(np.array(self.mapper.points), self.mapper.indexes)
+        grid = HexGrid.from_elements(operations, merge_tol)
 
         super().__init__(grid, report)
+        self.operations = operations
 
     def _backport(self) -> None:
         # Move every point of every operation to wherever it is now
-        for iop, indexes in enumerate(self.mapper.indexes):
-            operation = self.mapper.elements[iop]
+        for iop, indexes in enumerate(self.grid.addressing):
+            operation = self.operations[iop]
 
             for ipnt, i in enumerate(indexes):
                 operation.points[ipnt].move_to(self.grid.points[i])