Skip to content
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.

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

[ENH] Add "extratrees" for oblique trees #46 #75

Merged
merged 34 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fcbda1d
initial commit
SUKI-O May 18, 2023
d3adbd5
WIP: modify node_split_random
SUKI-O May 25, 2023
2b41c97
WIP: modify node_split func in splitter
SUKI-O May 27, 2023
1453a48
merging main
SUKI-OGIHARA Jul 3, 2023
0c81ea0
rework extra-trees, add tests
SUKI-OGIHARA Jul 4, 2023
1540e6d
merge main
SUKI-OGIHARA Jul 8, 2023
1f851a5
add example plot to compare extra oblique RF & oblique RF
SUKI-OGIHARA Jul 14, 2023
56dd610
Merge branch 'main' into extraobliquetree
SUKI-OGIHARA Jul 14, 2023
42c5df9
WIP:fix plot, docs
SUKI-OGIHARA Jul 23, 2023
c8d6849
fix docs, format
SUKI-OGIHARA Jul 23, 2023
faf1854
add decision surface plt
SUKI-OGIHARA Aug 5, 2023
5f6e547
Merge branch 'main' into extraobliquetree
adam2392 Aug 11, 2023
ded3143
Complete merge
adam2392 Aug 16, 2023
92efdfd
New changes
adam2392 Aug 16, 2023
36f7125
Merge branch 'extraobliquetree' of github.com:SUKI-O/scikit-tree into…
adam2392 Aug 16, 2023
6b196d9
Fix
adam2392 Aug 16, 2023
4a8f7d5
Fixed ci
adam2392 Aug 16, 2023
1bfffb7
Fix ci
adam2392 Aug 16, 2023
338428a
Fixed
adam2392 Aug 16, 2023
301e7d1
Merge branch 'main' into extraobliquetree
SUKI-O Aug 24, 2023
f5ee9e4
update docs
SUKI-OGIHARA Aug 24, 2023
a61c95f
fix bug
SUKI-OGIHARA Aug 24, 2023
9dd2a45
bug fix
SUKI-OGIHARA Aug 24, 2023
76cbbb1
Merge branch 'main' into extraobliquetree
adam2392 Aug 24, 2023
9b7d7d9
Remove unnecessary files
adam2392 Aug 24, 2023
fb107be
tweeked test params
SUKI-OGIHARA Sep 1, 2023
912c9b3
add tests for extratrees
SUKI-OGIHARA Sep 3, 2023
1ed19e2
fix typo
SUKI-OGIHARA Sep 3, 2023
3906a10
add plot for sample size comparison, clean up
SUKI-OGIHARA Sep 9, 2023
51721eb
Merge branch 'main' into extraobliquetree
SUKI-O Sep 10, 2023
6322271
fix format, docs
SUKI-O Sep 10, 2023
2e8bdbc
Merge branch 'main' into extraobliquetree
SUKI-O Sep 10, 2023
d47f718
Clean up PR
adam2392 Sep 10, 2023
99cfcf6
Fix docs
adam2392 Sep 10, 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
1 change: 1 addition & 0 deletions docs/whats_new/v0.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Changelog
- |Feature| All tree types can compute similarity and dissimilarity matrices, by `Sambit Panda`_ and `Adam Li`_ (:pr:`64`)
- |Feature| MORF trees now can normalize by feature weight per sample per feature column, by `Adam Li`_ (:pr:`67`)
- |Feature| Implementation of ObliqueDecisionTreeRegressor, PatchObliqueDecisionTreeRegressor, ObliqueRandomForestRegressor, PatchObliqueRandomForestRegressor, by `SUKI-O`_ (:pr:`72`)
- |Feature| Implementation of ExtraObliqueDecisionTreeClassifier, ExtraObliqueDecisionTreeRegressor by `SUKI-O`_ (:pr:`75`)
SUKI-O marked this conversation as resolved.
Show resolved Hide resolved

Code and Documentation Contributors
-----------------------------------
Expand Down
4 changes: 4 additions & 0 deletions sktree/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
UnsupervisedObliqueRandomForest,
)
from .ensemble._supervised_forest import (
ExtraObliqueRandomForestClassifier,
# ExtraObliqueRandomForestRegressor,
ObliqueRandomForestClassifier,
ObliqueRandomForestRegressor,
PatchObliqueRandomForestClassifier,
Expand All @@ -56,6 +58,8 @@
__all__ = [
"tree",
"ensemble",
"ExtraObliqueRandomForestClassifier",
# "ExtraObliqueRandomForestRegressor",
"ObliqueRandomForestClassifier",
"ObliqueRandomForestRegressor",
"PatchObliqueRandomForestClassifier",
Expand Down
3 changes: 2 additions & 1 deletion sktree/ensemble/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from ._supervised_forest import (
from ._supervised_forest import ( # ExtraObliqueRandomForestRegressor,
ExtraObliqueRandomForestClassifier,
ObliqueRandomForestClassifier,
ObliqueRandomForestRegressor,
PatchObliqueRandomForestClassifier,
Expand Down
Loading