Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ENH Uses x[i] to represent features in tree plotting #23480

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
lorentzenchr merged 2 commits into from
Jun 1, 2022
Merged

ENH Uses x[i] to represent features in tree plotting #23480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e949f8
ENH Uses more didactic x[i] to represent features
thomasjpfan May 27, 2022
a843ec2
DOC Adds PR number
thomasjpfan May 27, 2022
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
3 changes: 3 additions & 0 deletions doc/whats_new/v1.2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ Changelog
:mod:`sklearn.tree`
...................

- |Enhancement| :func:`tree.plot_tree`, :func:`tree.export_graphviz` now uses
a lower case `x[i]` to represent feature `i`. :pr:`23480` by `Thomas Fan`_.

- |Fix| Fixed invalid memory access bug during fit in
:class:`tree.DecisionTreeRegressor` and :class:`tree.DecisionTreeClassifier`.
:pr:`23273` by `Thomas Fan`_.
Expand Down
6 changes: 3 additions & 3 deletions sklearn/tree/_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def plot_tree(

feature_names : list of strings, default=None
Names of each of the features.
If None, generic names will be used ("X[0]", "X[1]", ...).
If None, generic names will be used ("x[0]", "x[1]", ...).

class_names : list of str or bool, default=None
Names of each of the target classes in ascending numerical order.
Expand Down Expand Up @@ -291,7 +291,7 @@ def node_to_str(self, tree, node_id, criterion):
if self.feature_names is not None:
feature = self.feature_names[tree.feature[node_id]]
else:
feature = "X%s%s%s" % (
feature = "x%s%s%s" % (
characters[1],
tree.feature[node_id],
characters[2],
Expand Down Expand Up @@ -789,7 +789,7 @@ def export_graphviz(

feature_names : list of str, default=None
Names of each of the features.
If None generic names will be used ("feature_0", "feature_1", ...).
If None, generic names will be used ("x[0]", "x[1]", ...).

class_names : list of str or bool, default=None
Names of each of the target classes in ascending numerical order.
Expand Down
16 changes: 8 additions & 8 deletions sklearn/tree/tests/test_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_graphviz_toy():
"digraph Tree {\n"
'node [shape=box, fontname="helvetica"] ;\n'
'edge [fontname="helvetica"] ;\n'
'0 [label="X[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'0 [label="x[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'value = [3, 3]"] ;\n'
'1 [label="gini = 0.0\\nsamples = 3\\nvalue = [3, 0]"] ;\n'
"0 -> 1 [labeldistance=2.5, labelangle=45, "
Expand Down Expand Up @@ -75,7 +75,7 @@ def test_graphviz_toy():
"digraph Tree {\n"
'node [shape=box, fontname="helvetica"] ;\n'
'edge [fontname="helvetica"] ;\n'
'0 [label="X[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'0 [label="x[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'value = [3, 3]\\nclass = yes"] ;\n'
'1 [label="gini = 0.0\\nsamples = 3\\nvalue = [3, 0]\\n'
'class = yes"] ;\n'
Expand Down Expand Up @@ -106,7 +106,7 @@ def test_graphviz_toy():
'node [shape=box, style="filled, rounded", color="black", '
'fontname="sans"] ;\n'
'edge [fontname="sans"] ;\n'
"0 [label=<X<SUB>0</SUB> &le; 0.0<br/>samples = 100.0%<br/>"
"0 [label=<x<SUB>0</SUB> &le; 0.0<br/>samples = 100.0%<br/>"
'value = [0.5, 0.5]>, fillcolor="#ffffff"] ;\n'
"1 [label=<samples = 50.0%<br/>value = [1.0, 0.0]>, "
'fillcolor="#e58139"] ;\n'
Expand All @@ -127,7 +127,7 @@ def test_graphviz_toy():
"digraph Tree {\n"
'node [shape=box, fontname="helvetica"] ;\n'
'edge [fontname="helvetica"] ;\n'
'0 [label="X[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'0 [label="x[0] <= 0.0\\ngini = 0.5\\nsamples = 6\\n'
'value = [3, 3]\\nclass = y[0]"] ;\n'
'1 [label="(...)"] ;\n'
"0 -> 1 ;\n"
Expand All @@ -147,7 +147,7 @@ def test_graphviz_toy():
'node [shape=box, style="filled", color="black", '
'fontname="helvetica"] ;\n'
'edge [fontname="helvetica"] ;\n'
'0 [label="node #0\\nX[0] <= 0.0\\ngini = 0.5\\n'
'0 [label="node #0\\nx[0] <= 0.0\\ngini = 0.5\\n'
'samples = 6\\nvalue = [3, 3]", fillcolor="#ffffff"] ;\n'
'1 [label="(...)", fillcolor="#C0C0C0"] ;\n'
"0 -> 1 ;\n"
Expand All @@ -170,14 +170,14 @@ def test_graphviz_toy():
'node [shape=box, style="filled", color="black", '
'fontname="helvetica"] ;\n'
'edge [fontname="helvetica"] ;\n'
'0 [label="X[0] <= 0.0\\nsamples = 6\\n'
'0 [label="x[0] <= 0.0\\nsamples = 6\\n'
"value = [[3.0, 1.5, 0.0]\\n"
'[3.0, 1.0, 0.5]]", fillcolor="#ffffff"] ;\n'
'1 [label="samples = 3\\nvalue = [[3, 0, 0]\\n'
'[3, 0, 0]]", fillcolor="#e58139"] ;\n'
"0 -> 1 [labeldistance=2.5, labelangle=45, "
'headlabel="True"] ;\n'
'2 [label="X[0] <= 1.5\\nsamples = 3\\n'
'2 [label="x[0] <= 1.5\\nsamples = 3\\n'
"value = [[0.0, 1.5, 0.0]\\n"
'[0.0, 1.0, 0.5]]", fillcolor="#f1bd97"] ;\n'
"0 -> 2 [labeldistance=2.5, labelangle=-45, "
Expand Down Expand Up @@ -215,7 +215,7 @@ def test_graphviz_toy():
"graph [ranksep=equally, splines=polyline] ;\n"
'edge [fontname="sans"] ;\n'
"rankdir=LR ;\n"
'0 [label="X[0] <= 0.0\\nsquared_error = 1.0\\nsamples = 6\\n'
'0 [label="x[0] <= 0.0\\nsquared_error = 1.0\\nsamples = 6\\n'
'value = 0.0", fillcolor="#f2c09c"] ;\n'
'1 [label="squared_error = 0.0\\nsamples = 3\\'
'nvalue = -1.0", '
Expand Down