Merge branch 'development' of github.com:damogranlabs/classy_blocks into development

Author: FranzBangar

src/classy_blocks/optimize/optimizer.py

@@ -116,7 +116,7 @@ def fquality(params):
     def _optimize_iteration(self, iteration_no: int) -> IterationRecord:
         rlf = self.relaxation_factor(iteration_no)
         irecord = IterationRecord(iteration_no, self.grid.quality, rlf)
-        self.reporter.iteration_start(iteration_no)
+        self.reporter.iteration_start(iteration_no, rlf)
 
         for clamp in self.grid.clamps:
             self._optimize_clamp(clamp, rlf)

src/classy_blocks/optimize/report.py

@@ -6,7 +6,7 @@
 
 class OptimizationReporterBase(abc.ABC):
     @abc.abstractmethod
-    def iteration_start(self, iteration_no: int) -> None:
+    def iteration_start(self, iteration_no: int, relaxation: float) -> None:
         pass
 
     @abc.abstractmethod
@@ -27,7 +27,7 @@ def optimization_end(self, orecord: OptimizationRecord) -> None:
 
 
 class SilentReporter(OptimizationReporterBase):
-    def iteration_start(self, iteration_no: int) -> None:
+    def iteration_start(self, iteration_no: int, relaxation: float) -> None:
         pass
 
     def clamp_start(self, crecord: ClampRecord) -> None:
@@ -44,8 +44,9 @@ def optimization_end(self, orecord: OptimizationRecord) -> None:
 
 
 class TextReporter(OptimizationReporterBase):
-    def iteration_start(self, iteration_no: int) -> None:
+    def iteration_start(self, iteration_no: int, relaxation: float) -> None:
         report(f"Optimization iteration {iteration_no}")
+        report(f"Relaxation: {relaxation}")
         report("{:6s}".format("Vertex"), end="")
         report("{:>12s}".format("Initial"), end="")
         report("{:>12s}".format("Local"), end="")