linearrf 1.2.3__tar.gz → 1.2.5__tar.gz

{linearrf-1.2.3/src/linearrf.egg-info → linearrf-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linearrf
-Version: 1.2.3
+Version: 1.2.5
 Summary: A python libary to build Random Forests with Linear Models at the leaves.
 Author-email: Marian Biermann <marianbiermann@gmx.de>
 Project-URL: homepage, https://github.com/marianbiermann/lrf

{linearrf-1.2.3 → linearrf-1.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "linearrf"
-version = "1.2.3"
+version = "1.2.5"
 description = "A python libary to build Random Forests with Linear Models at the leaves."
 readme = "README.md"
 authors = [{ name = "Marian Biermann", email = "marianbiermann@gmx.de" }]

{linearrf-1.2.3 → linearrf-1.2.5/src/linearrf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linearrf
-Version: 1.2.3
+Version: 1.2.5
 Summary: A python libary to build Random Forests with Linear Models at the leaves.
 Author-email: Marian Biermann <marianbiermann@gmx.de>
 Project-URL: homepage, https://github.com/marianbiermann/lrf

{linearrf-1.2.3 → linearrf-1.2.5}/src/lrf/_base_lrf.py

@@ -160,8 +160,10 @@ class _LinearRandomForest:
             imp = self._calc_imp(node.left_node, imp)
             imp = self._calc_imp(node.right_node, imp)
         else:
-            np.add(imp, np.abs(node.model.coef_[1:]), out=imp)
-
+            if self.linear_model is None:
+                np.add(imp, np.abs(node.model.coef_[1:]), out=imp)
+            else:
+                np.add(imp, np.abs(node.model.coef_), out=imp)
         return imp
 
     @staticmethod
@@ -379,8 +381,13 @@ class _LinearRandomForest:
             txt += self._node_to_text(node=node.right_node, column_names=column_names, ndigits=ndigits)
 
         else:
-            intercept = node.model.coef_[0]
-            weights = node.model.coef_[1:]
+            if self.linear_model is None:
+                intercept = node.model.coef_[0]
+                weights = node.model.coef_[1:]
+            else:
+                intercept = node.model.intercept_
+                weights = node.model.coef_
+
             weights = ['+' + str(round(w, ndigits)) if w > 0 else str(round(w, ndigits)) for w in weights]
             if column_names is None:
                 cols = ['col_{}'.format(i) for i in range(len(weights))]

{linearrf-1.2.3 → linearrf-1.2.5}/src/lrf/lrf.py

@@ -163,7 +163,8 @@ class LRFClassifier(_LinearRandomForest):
             x = x.to_numpy()
 
         # add intercept here and not inside linear model for performance reasons
-        x = np.insert(x, 0, 1, axis=1)
+        if self.linear_model is None:
+            x = np.insert(x, 0, 1, axis=1)
 
         # add columns with row index for sorting after multiprocessing
         x = np.insert(x, 0, np.arange(x.shape[0]), axis=1)