more tidying

neurodata · SamuelCarliles3 · Feb 16, 2024 · Feb 16, 2024 · Feb 16, 2024 · Feb 20, 2024
commit ee3399faf3e2d01f0ccf05e3b7083fe7cbd287c6
diff --git a/sklearn/tree/_splitter.pxd b/sklearn/tree/_splitter.pxd
@@ -27,33 +27,23 @@ cdef struct SplitConditionTuple:
     SplitCondition f
     SplitConditionParameters p
 
-cdef struct DummyParameters:
-    int dummy
-
-cdef inline DummyParameters* create_dummy_parameters(int dummy):
-    cdef DummyParameters* result = <DummyParameters*>malloc(sizeof(DummyParameters))
-    if result == NULL:
-        return NULL
-    result.dummy = dummy
-    return result
+cdef inline bint has_data_condition(Splitter splitter, SplitConditionParameters split_condition_parameters) noexcept nogil:
+    return splitter.n_samples < 10
 
-cdef struct Condition1Parameters:
-    int some_number
+cdef struct AlphaRegularityParameters:
+    float64_t alpha
 
-cdef inline Condition1Parameters* create_condition1_parameters(int some_number):
-    cdef Condition1Parameters* result = <Condition1Parameters*>malloc(sizeof(Condition1Parameters))
+cdef inline AlphaRegularityParameters* create_alpha_regularity_parameters(float64_t alpha):
+    cdef AlphaRegularityParameters* result = <AlphaRegularityParameters*>malloc(sizeof(AlphaRegularityParameters))
     if result == NULL:
         return NULL
-    result.some_number = some_number
+    result.alpha = alpha
     return result
 
-cdef inline bint condition1(Splitter splitter, SplitConditionParameters split_condition_parameters) noexcept nogil:
-    cdef Condition1Parameters* p = <Condition1Parameters*>split_condition_parameters
-
-    return splitter.n_samples > 0 and p.some_number < 1000
+cdef inline bint alpha_regularity_condition(Splitter splitter, SplitConditionParameters split_condition_parameters) noexcept nogil:
+    cdef AlphaRegularityParameters* p = <AlphaRegularityParameters*>split_condition_parameters
 
-cdef inline bint condition2(Splitter splitter, SplitConditionParameters split_condition_parameters) noexcept nogil:
-    return splitter.n_samples < 10
+    return 1
 
 
 cdef struct SplitRecord:

diff --git a/sklearn/tree/_splitter.pyx b/sklearn/tree/_splitter.pyx
@@ -46,22 +46,18 @@ cdef float32_t EXTRACT_NNZ_SWITCH = 0.1
 from ._tree cimport Tree
 cdef class FooTree(Tree):
     cdef Splitter splitter
-    cdef Condition1Parameters* c1p
-    cdef DummyParameters* dummy_params
+    cdef AlphaRegularityParameters* p_alpha
 
     def __init__(self):
-        self.c1p = create_condition1_parameters(5)
-        self.dummy_params = create_dummy_parameters(0)
+        self.p_alpha = create_alpha_regularity_parameters(0.2)
 
         self.splitter = Splitter()
-        self.splitter.presplit_conditions.push_back(SplitConditionTuple(condition1, self.c1p))
-        self.splitter.presplit_conditions.push_back(SplitConditionTuple(condition2, self.dummy_params))
+        self.splitter.presplit_conditions.push_back(SplitConditionTuple(alpha_regularity_condition, self.p_alpha))
+        self.splitter.presplit_conditions.push_back(SplitConditionTuple(has_data_condition, NULL))

     def __dealloc__(self):
-        if self.c1p is not NULL:
-            free(self.c1p)
-        if self.dummy_params is not NULL:
-            free(self.dummy_params)
+        if self.p_alpha is not NULL:
+            free(self.p_alpha)
 
 
 cdef inline void _init_split(SplitRecord* self, intp_t start_pos) noexcept nogil: