another step

xadupre · xadupre · commit 2e8d17a7435e · 2023-09-17T15:19:58.000+02:00
diff --git a/_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment.py b/_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment.py
@@ -36,6 +36,7 @@ def test_criterions(self):
         self.assertEqual(w.sum(), X.shape[0])
         ind = numpy.arange(y.shape[0]).astype(numpy.int64)
         ys = y.astype(float).reshape((y.shape[0], 1))
+        ys = numpy.ascontiguousarray(ys, dtype=numpy.float64).copy()
         _test_criterion_init(c1, ys, w, 1.0, ind, 0, y.shape[0])
         _test_criterion_init(c2, ys, w, 1.0, ind, 0, y.shape[0])
         return
diff --git a/mlinsights/mlmodel/_piecewise_tree_regression_common.pyx b/mlinsights/mlmodel/_piecewise_tree_regression_common.pyx
@@ -219,14 +219,26 @@ cdef class CommonRegressorCriterion(Criterion):
                                  - (self.weighted_n_left / weight * impurity_left)))
 
 
-cpdef _test_criterion_init(Criterion criterion,
-                           const DOUBLE_t[:, ::1] y,
-                           DOUBLE_t[:] sample_weight,
-                           double weighted_n_samples,
-                           SIZE_t[:] samples,
-                           SIZE_t start, SIZE_t end):
+cdef int _ctest_criterion_init(Criterion criterion,
+                               const DOUBLE_t[:, ::1] y,
+                               DOUBLE_t[:] sample_weight,
+                               double weighted_n_samples,
+                               SIZE_t[:] samples,
+                               SIZE_t start, SIZE_t end):
     "Test purposes. Methods cannot be directly called from python."
-    if criterion.init(y, sample_weight, weighted_n_samples, samples, start, end) != 0:
+    cdef const DOUBLE_t[:, ::1] y2 = y
+    return criterion.init(y2, sample_weight, weighted_n_samples, samples, start, end)
+
+
+def _test_criterion_init(Criterion criterion,
+                         const DOUBLE_t[:, ::1] y,
+                         DOUBLE_t[:] sample_weight,
+                         double weighted_n_samples,
+                         SIZE_t[:] samples,
+                         SIZE_t start, SIZE_t end):
+    "Test purposes. Methods cannot be directly called from python."
+    if _ctest_criterion_init(criterion, y, sample_weight, weighted_n_samples,
+                             samples, start, end) != 0:
         raise AssertionError("Return is not 0.")
 
 
