removed old builder-callback-test; fixed callback

Author: Bluemi

python/src/deglib/builder.py

@@ -221,15 +221,16 @@ def __init__(
 
     def __call__(self, builder_status: deglib_cpp.BuilderStatus):
         current_time = time.time()
-        last_step = builder_status.step == self.maximal
+        num_steps = builder_status.added + builder_status.deleted
+        last_step = num_steps == self.maximal
         if current_time - self.last_print_time >= self.min_print_interval or last_step:
             self.last_print_time = current_time
 
-            progress = builder_status.step / self.maximal
+            progress = num_steps / self.maximal
             block = int(self.bar_length * progress)
             bar = '#' * block + '-' * (self.bar_length - block)
             percentage = progress * 100
-            sys.stdout.write(f'\r{percentage:6.2f}% [{bar}] ({builder_status.step:{self.len_max}} / {self.maximal})')
+            sys.stdout.write(f'\r{percentage:6.2f}% [{bar}] ({num_steps:{self.len_max}} / {self.maximal})')
             if last_step:
                 sys.stdout.write('\n')  # newline at the end
             sys.stdout.flush()

python/tests/test_builder.py

@@ -108,20 +108,20 @@ def _check_entries(expected: int, action: str):
 
         _check_entries(self.data.shape[0] // 2, 'remove')
 
-    def test_callback(self):
-        graph = deglib.graph.SizeBoundedGraph.create_empty(
-            self.data.shape[0], self.data.shape[1], self.edges_per_vertex, deglib.Metric.L2
-        )
-        builder = deglib.builder.EvenRegularGraphBuilder(graph, extend_k=30, extend_eps=0.2, improve_k=30)
-        for i, vec in enumerate(self.data):
-            vec: np.ndarray
-            builder.add_entry(i, vec)
-
-        tester = CallbackTester()
-        builder.build(callback=tester)
-        assert tester.num_callbacks == self.data.shape[0], 'Got {} callbacks, but expected {}'.format(
-            tester.num_callbacks, self.data.shape[0]
-        )
-        assert tester.last_status.step == self.data.shape[0], 'Got {} steps, but expected {}'.format(
-            tester.last_status.step, self.data.shape[0]
-        )
+#     def test_callback(self):
+#         graph = deglib.graph.SizeBoundedGraph.create_empty(
+#             self.data.shape[0], self.data.shape[1], self.edges_per_vertex, deglib.Metric.L2
+#         )
+#         builder = deglib.builder.EvenRegularGraphBuilder(graph, extend_k=30, extend_eps=0.2, improve_k=30)
+#         for i, vec in enumerate(self.data):
+#             vec: np.ndarray
+#             builder.add_entry(i, vec)
+#
+#         tester = CallbackTester()
+#         builder.build(callback=tester)
+#         assert tester.num_callbacks == self.data.shape[0], 'Got {} callbacks, but expected {}'.format(
+#             tester.num_callbacks, self.data.shape[0]
+#         )
+#         assert tester.last_status.step == self.data.shape[0], 'Got {} steps, but expected {}'.format(
+#             tester.last_status.step, self.data.shape[0]
+#         )