Doctorado-ML/stree
1
1
Fork 0
mirror of https://github.com/Doctorado-ML/STree.git synced 2025-08-18 17:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix depth sometimes is wrong (#26) (#29)

Browse Source 
Add a test to the tests set
Add depth to node description
Fix iterator and str test due to this addon
This commit is contained in:
Ricardo Montañana Gómez
2021-03-23 14:08:53 +01:00
committed by GitHub
parent f438124057
commit 460c63a6d0
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stree/Strees.py
View File

@@ -635,6 +635,7 @@ class Stree(BaseEstimator, ClassifierMixin):
X = X[~indices_zero, :]
y = y[~indices_zero]
sample_weight = sample_weight[~indices_zero]
self.depth_ = max(depth, self.depth_)
if np.unique(y).shape[0] == 1:
# only 1 class => pure dataset
return Snode(
@@ -652,7 +653,6 @@ class Stree(BaseEstimator, ClassifierMixin):
clf.fit(Xs, y, sample_weight=sample_weight)
impurity = self.splitter_.partition_impurity(y)
node = Snode(clf, X, y, features, impurity, title, sample_weight)
self.depth_ = max(depth, self.depth_)
self.splitter_.partition(X, node, True)
X_U, X_D = self.splitter_.part(X)
y_u, y_d = self.splitter_.part(y)
@@ -668,8 +668,14 @@ class Stree(BaseEstimator, ClassifierMixin):
title=title + ", <cgaf>",
weight=sample_weight,
)
node.set_up(self.train(X_U, y_u, sw_u, depth + 1, title + " - Up"))
node.set_down(self.train(X_D, y_d, sw_d, depth + 1, title + " - Down"))
node.set_up(
self.train(X_U, y_u, sw_u, depth + 1, title + f" - Up({depth+1})")
)
node.set_down(
self.train(
X_D, y_d, sw_d, depth + 1, title + f" - Down({depth+1})"
)
)
return node
def _build_predictor(self):