Skip to content

[MRG+1] EHN Add bootstrap sample size limit to forest ensembles #14682

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

Merged
merged 31 commits into from
Sep 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9b66811
Add max_samples bootstrap size kwarg
notmatthancock Aug 18, 2019
b845709
Refactor unit tests
notmatthancock Aug 18, 2019
6db3384
Add one more assert check in index helper test
notmatthancock Aug 18, 2019
2507d5b
Move validation and bootstrap size get to helper
notmatthancock Aug 18, 2019
4fa10a9
Compute bootstrap size just once
notmatthancock Aug 18, 2019
3eb299c
n_bootstrap_samples -> n_samples_bootstrap; update docstring
notmatthancock Aug 20, 2019
081b7b7
Refactor exception tests for max_samples
notmatthancock Aug 20, 2019
cf8b0cb
n_bootstrap_samples -> n_samples_bootstrap in signatures
notmatthancock Aug 20, 2019
49a949a
Add max_samples kwarg to RandomForestRegressor
notmatthancock Aug 20, 2019
0e2b386
Revert doc default
notmatthancock Aug 20, 2019
ef5efe1
Move n_samples_bootstrap out of loop
notmatthancock Aug 21, 2019
07865fd
Merge branch 'master' into feature/rf-subsample
notmatthancock Aug 21, 2019
5bc7796
Add max_samples to RandomTreesEmbedding
notmatthancock Aug 21, 2019
75ce338
Change docstring style for default
notmatthancock Aug 27, 2019
37104d3
Update grammar in docstring
notmatthancock Aug 27, 2019
93e1840
Refactor conditional structures
notmatthancock Aug 27, 2019
005d6ca
Add version added tag; change call style
notmatthancock Aug 27, 2019
eac5ad6
Remove docstring from unit test
notmatthancock Aug 27, 2019
d9de541
Add exception message checks to unit test
notmatthancock Aug 27, 2019
93e5799
Refactor toy data unit test
notmatthancock Aug 27, 2019
9cdd5c2
Add node count check unit test
notmatthancock Aug 27, 2019
c42db3b
Merge remote-tracking branch 'origin/master' into pr/notmatthancock/1…
glemaitre Sep 9, 2019
9d72d36
Limit unit test to RandomForest*
notmatthancock Sep 10, 2019
1622ad6
Merge branch 'feature/rf-subsample' of github.com:notmatthancock/scik…
notmatthancock Sep 10, 2019
c95cecf
Add whats new entry
notmatthancock Sep 11, 2019
fa2be88
Merge branch 'master' into feature/rf-subsample
notmatthancock Sep 11, 2019
4548191
Include bootstrap condition in docstring comments
notmatthancock Sep 12, 2019
58f005c
Rename forest_class -> ForestClass
notmatthancock Sep 12, 2019
7869f87
Escape all the special chars
notmatthancock Sep 13, 2019
e8535d4
Remove extraneous test
notmatthancock Sep 14, 2019
5b72dcc
comments adrin
glemaitre Sep 20, 2019
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
12 changes: 12 additions & 0 deletions doc/whats_new/v0.22.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,18 @@ Changelog
and :class:`ensemble.HistGradientBoostingRegressor` instead.
:pr:`14907` by `Adrin Jalali`_.

- |Enhancement| Addition of ``max_samples`` argument allows limiting
size of bootstrap samples to be less than size of dataset. Added to
:class:`ensemble.forest.ForestClassifier`,
:class:`ensemble.forest.ForestRegressor`,
:class:`ensemble.forest.RandomForestClassifier`,
:class:`ensemble.forest.RandomForestRegressor`,
:class:`ensemble.forest.ExtraTreesClassifier`,
:class:`ensemble.forest.ExtraTreesRegressor`,
:class:`ensemble.forest.RandomTreesEmbedding`. :pr:`14682` by
:user:`Matt Hancock <notmatthancock>` and
:pr:`5963` by :user:`Pablo Duboue <DrDub>`.

:mod:`sklearn.feature_extraction`
.................................

Expand Down
Loading