Fix issue #135

scikit-learn-contrib · Sep 28, 2016 · ed58d71 · ed58d71
1 parent 3386bfe
commit ed58d71
Show file tree

Hide file tree

Showing 9 changed files with 5,491 additions and 4,887 deletions.
diff --git a/pyearth/_basis.c b/pyearth/_basis.c
diff --git a/pyearth/_basis.pxd b/pyearth/_basis.pxd
@@ -30,6 +30,10 @@ cdef class BasisFunction:
 
     cpdef BasisFunction get_coverage(BasisFunction self, INDEX_t variable)
 
+    cpdef bool has_linear(BasisFunction self, INDEX_t variable)
+
+    cpdef bool linear_in(BasisFunction self, INDEX_t variable)
+
     cpdef _set_parent(BasisFunction self, BasisFunction parent)
 
     cpdef _add_child(BasisFunction self, BasisFunction child)
@@ -184,6 +188,8 @@ cdef class HingeBasisFunction(HingeBasisFunctionBase):
                             dict knot_dict, dict translation)
 
 cdef class LinearBasisFunction(DataVariableBasisFunction):
+    cpdef bool linear_in(LinearBasisFunction self, INDEX_t variable)
+
     cpdef _smoothed_version(LinearBasisFunction self, BasisFunction parent,
                             dict knot_dict, dict translation)
 

diff --git a/pyearth/_basis.pyx b/pyearth/_basis.pyx
@@ -115,7 +115,17 @@ cdef class BasisFunction:
             if child.covered(variable):
                 return child
         return None
-
+
+    cpdef bool has_linear(BasisFunction self, INDEX_t variable):
+        cdef BasisFunction child  # @DuplicatedSignature
+        for child in self.get_children():
+            if child.linear_in(variable):
+                return True
+        return False
+
+    cpdef bool linear_in(BasisFunction self, INDEX_t variable):
+        return False
+
     cpdef _set_parent(BasisFunction self, BasisFunction parent):
         '''Calls _add_child.'''
         self.parent = parent
@@ -849,6 +859,9 @@ cdef class LinearBasisFunction(DataVariableBasisFunction):
         self.variable = variable
         self.label = label if label is not None else 'x' + str(variable)
         self._set_parent(parent)
+
+    cpdef bool linear_in(LinearBasisFunction self, INDEX_t variable):
+        return variable == self.variable
 
     cpdef _smoothed_version(LinearBasisFunction self, BasisFunction parent,
                             dict knot_dict, dict translation):