improve testing

xadupre · xadupre · commit 740aae4268d3 · 2023-10-30T14:41:32.000+01:00
diff --git a/_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment.py b/_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment.py
@@ -12,6 +12,7 @@
     _test_criterion_node_impurity_children,
     _test_criterion_update,
     _test_criterion_node_value,
+    _test_criterion_printf,
     _test_criterion_proxy_impurity_improvement,
     _test_criterion_impurity_improvement,
 )
@@ -120,8 +121,15 @@ def test_criterions(self):
             self.assertEqual(v1, v2)
             p1 = _test_criterion_impurity_improvement(c1, 0.0, left1, right1)
             p2 = _test_criterion_impurity_improvement(c2, 0.0, left2, right2)
-            # print(left1, right1, "*", left2, right2)
-            # print(c2.printd())
+            self.assertIn(
+                "value: 1.500000 total=0.260000 left=0.000000 right=0.186667",
+                _test_criterion_printf(c1),
+            )
+            self.assertIn(
+                "value: 1.500000 total=0.260000 left=0.000000 right=0.186667",
+                _test_criterion_printf(c2),
+            )
+            self.assertEqual(_test_criterion_printf(c1), _test_criterion_printf(c2))
             self.assertAlmostEqual(p1, p2, atol=1e-10)
 
         X = numpy.array([[1.0, 2.0, 10.0, 11.0]]).T
diff --git a/mlinsights/mlmodel/_piecewise_tree_regression_common.pyx b/mlinsights/mlmodel/_piecewise_tree_regression_common.pyx
@@ -308,13 +308,15 @@ def _test_criterion_update(Criterion criterion, SIZE_t new_pos):
 
 def _test_criterion_printf(Criterion crit):
     "Test purposes. Methods cannot be directly called from python."
-    printf("start=%zu pos=%zu end=%zu\n", crit.start, crit.pos, crit.end)
     cdef DOUBLE_t left, right, value
     cdef int i
     crit.children_impurity(&left, &right)
     crit.node_value(&value)
-    printf("value: %f total=%f left=%f right=%f\n", value,
-           crit.node_impurity(), left, right)
+    rows = []
+    rows.append("start=%d pos=%d end=%d" % (crit.start, crit.pos, crit.end))
+    rows.append("value: %f total=%f left=%f right=%f" % (
+            value, crit.node_impurity(), left, right))
     cdef int n = crit.y.shape[0]
     for i in range(0, n):
-        printf("-- %d: y=%f\n", i, crit.y[i, 0])
+        rows.append("-- %d: y=%f" % (i, crit.y[i, 0]))
+    return "\n".join(rows)
