Skip to content

Updates tree decision criterion for scikit-learn 1.2 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jul 2, 2023
Merged

Updates tree decision criterion for scikit-learn 1.2 #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c884e77
update for scikit-learn 1.2
xadupre Jan 7, 2023
3d1e4e5
fix compilation issues, updates API
xadupre Jan 8, 2023
e426878
fix compilation issues
xadupre Jan 8, 2023
73a88e5
switch to development version of scikit-learn
xadupre Jan 8, 2023
cf4b29e
remove normalize, update to the latest API
sdpython Jan 8, 2023
8c46e61
Update test_sklearn_stacking.py
sdpython Jan 8, 2023
1316fa1
Update test_sklearn_stacking.py
sdpython Jan 8, 2023
b12859a
Update test_piecewise_classifier.py
sdpython Jan 8, 2023
8772404
Merge branch 'master' of https://github.com/sdpython/mlinsights into …
sdpython Feb 2, 2023
b58e8ac
Merge branch 'master' of https://github.com/sdpython/mlinsights into …
sdpython Feb 2, 2023
e8d34fa
update requirements
sdpython Feb 4, 2023
4d955b3
fix for scikit-learn==1.3.0
xadupre Jul 2, 2023
d553c72
fix issue
xadupre Jul 2, 2023
b295cdd
disable one warning
xadupre Jul 2, 2023
ccb580d
lint
xadupre Jul 2, 2023
83144bc
setup
xadupre Jul 2, 2023
518578b
requirements.txt
xadupre Jul 2, 2023
039ec98
requirements
xadupre Jul 2, 2023
ff6aa0a
remove appveyor
xadupre Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix issue
  • Loading branch information
@xadupre
xadupre committed Jul 2, 2023
commit d553c724c43cf3fb9672aaa561d211b7b7fe21d8
2 changes: 0 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ jobs:
architecture: 'x64'
- script: gcc --version
displayName: 'gcc version'
- script: brew update
displayName: 'brew update'
- script: export
displayName: 'export'
- script: gcc --version
Expand Down
2 changes: 1 addition & 1 deletion mlinsights/mlmodel/sklearn_transform_inv_fct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def transform(self, X, y):
if y is None:
return X, None
self._check_is_fitted()
if len(y.shape) == 1 or y.dtype in (numpy.str, numpy.int32, numpy.int64):
if len(y.shape) == 1 or y.dtype in (numpy.str_, numpy.int32, numpy.int64):
# permutes classes
yp = y.copy().ravel()
num = numpy.issubdtype(y.dtype, numpy.floating)
Expand Down
16 changes: 6 additions & 10 deletions mlinsights/mltree/tree_digitize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ def add_root(index):
is_left = False
is_leaf = False
threshold = bins[index]
n = tree_add_node(
tree, parent, is_left, is_leaf, 0, threshold, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, is_leaf, 0, threshold, 0, 1, 1., 0)
values.append(UNUSED)
n_nodes.append(n)
return n
Expand All @@ -96,16 +95,15 @@ def add_nodes(parent, i, j, is_left):
# it means j is the parent split
if i == j:
# leaf
n = tree_add_node(tree, parent, is_left, True, 0, 0, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, True, 0, 0, 0, 1, 1., 0)
n_nodes.append(n)
values.append(i)
return n
if i + 1 == j:
# split
values.append(UNUSED)
th = bins[i]
n = tree_add_node(tree, parent, is_left,
False, 0, th, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, False, 0, th, 0, 1, 1., 0)
n_nodes.append(n)
add_nodes(n, i, i, True)
add_nodes(n, i, j, False)
Expand All @@ -115,8 +113,7 @@ def add_nodes(parent, i, j, is_left):
values.append(UNUSED)
index = (i + j) // 2
th = bins[index]
n = tree_add_node(tree, parent, is_left,
False, 0, th, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, False, 0, th, 0, 1, 1., 0)
n_nodes.append(n)
add_nodes(n, i, index, True)
add_nodes(n, index, j, False)
Expand All @@ -126,16 +123,15 @@ def add_nodes(parent, i, j, is_left):
if i + 1 == j:
# leaf
values.append(j)
n = tree_add_node(tree, parent, is_left, True, 0, 0, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, True, 0, 0, 0, 1, 1., 0)
n_nodes.append(n)
return n
if i + 1 < j:
# split
values.append(UNUSED)
index = (i + j) // 2
th = bins[index]
n = tree_add_node(tree, parent, is_left,
False, 0, th, 0, 1, 1.)
n = tree_add_node(tree, parent, is_left, False, 0, th, 0, 1, 1., 0)
n_nodes.append(n)
add_nodes(n, i, index, True)
add_nodes(n, index, j, False)
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy