Fix Lapsus Importii

Author: FranzBangar

src/classy_blocks/optimize/optimizer.py

@@ -14,7 +14,7 @@
 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.records import (
+from classy_blocks.optimize.record import (
     ClampRecord,
     IterationRecord,
     MinimizationMethodType,
@@ -120,7 +120,6 @@ def optimize(
         Within each iteration, all vertices will be moved, starting with the one with the most influence on quality.
         Lower tolerance values.
 
-        TODO:
         Returns True is optimization was successful (tolerance reached)"""
         data = OptimizationData(max_iterations=max_iterations, rel_tol=tolerance, method=method, **kwargs)
         orecord = OptimizationRecord(time.time(), self.grid.quality)  # TODO: cache repeating quality queries
@@ -141,7 +140,8 @@ def optimize(
         orecord.time_end = time.time()
         self.reporter.optimization_end(orecord)
         self.backport()
-        return True  # TODO: return properly
+
+        return orecord.termination in ("abs", "rel")
 
     @abc.abstractmethod
     def backport(self) -> None:

tests/test_optimize/test_optimizer.py

@@ -27,7 +27,7 @@ def test_relaxation(self, relaxation, iteration, result):
         self.assertAlmostEqual(OptimizerBase.relaxation_factor(data, iteration), result)
 
     def test_add_junction_existing(self):
-        optimizer = MeshOptimizer(self.mesh)
+        optimizer = MeshOptimizer(self.mesh, report=False)
         optimizer.add_clamp(FreeClamp(self.mesh.vertices[0].position))
 
         with self.assertRaises(ClampExistsError):
@@ -39,7 +39,7 @@ def test_optimize(self):
         vertex = self.get_vertex([0, 0, 0])
         vertex.move_to([0.3, 0.3, 0.3])
 
-        optimizer = MeshOptimizer(self.mesh)
+        optimizer = MeshOptimizer(self.mesh, report=False)
 
         clamp = FreeClamp(vertex.position)
         optimizer.add_clamp(clamp)
@@ -56,7 +56,7 @@ def test_optimize_linked(self):
         link = TranslationLink(vertex.position, follower_vertex.position)
         clamp = FreeClamp(vertex.position)
 
-        optimizer = MeshOptimizer(self.mesh)
+        optimizer = MeshOptimizer(self.mesh, report=False)
         optimizer.add_clamp(clamp)
         optimizer.add_link(link)
 
@@ -71,7 +71,7 @@ def test_optimize_manual(self):
         sketch = MappedSketch(self.positions, self.quads)
         clamp = PlaneClamp([1.2, 1.6, 0], [0, 0, 0], [0, 0, 1])
 
-        optimizer = SketchOptimizer(sketch)
+        optimizer = SketchOptimizer(sketch, report=False)
         optimizer.add_clamp(clamp)
 
         optimizer.optimize(method="L-BFGS-B")
@@ -81,7 +81,7 @@ def test_optimize_manual(self):
     def test_optimize_auto(self):
         sketch = MappedSketch(self.positions, self.quads)
 
-        optimizer = SketchOptimizer(sketch)
+        optimizer = SketchOptimizer(sketch, report=False)
         optimizer.auto_optimize(method="L-BFGS-B")
 
         np.testing.assert_almost_equal(sketch.positions[4], [1, 1, 0], decimal=1)
@@ -139,7 +139,7 @@ def setUp(self):
     def test_optimize(self):
         smoother = SketchSmoother(self.sketch)
         smoother.smooth()
-        optimizer = SketchOptimizer(self.sketch)
+        optimizer = SketchOptimizer(self.sketch, report=False)
         initial_quality = optimizer.grid.quality
 
         optimizer.auto_optimize(tolerance=1e-6, method="Nelder-Mead")