-
-
Notifications
You must be signed in to change notification settings - Fork 21
Allow different splitting rules #96
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
55124a2
Added an option to specify different splitting rules for each dimension
velochy 94c664a
Allow batch sampling in tree.predict, speeding up _sample_posterior b…
velochy 11ce6b0
Addressed most issues flagged in PR comments
velochy bdb081a
Fix the reference to flexBART
velochy 78439e6
Added tests for split rules
velochy 9247f7b
Fix mypy annotations
velochy 6d8987d
Fix linter issues
velochy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
# Copyright 2022 The PyMC Developers | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from abc import abstractmethod | ||
from numba import njit | ||
import numpy as np | ||
|
||
|
||
class SplitRule: | ||
""" | ||
Abstract template class for a split rule | ||
""" | ||
|
||
@staticmethod | ||
@abstractmethod | ||
def get_split_value(available_splitting_values): | ||
pass | ||
|
||
@staticmethod | ||
@abstractmethod | ||
def divide(available_splitting_values, split_value): | ||
pass | ||
|
||
|
||
class ContinuousSplitRule(SplitRule): | ||
""" | ||
Standard continuous split rule: pick a pivot value and split | ||
depending on if variable is smaller or greater than the value picked. | ||
""" | ||
|
||
@staticmethod | ||
def get_split_value(available_splitting_values): | ||
split_value = None | ||
if available_splitting_values.size > 1: | ||
idx_selected_splitting_values = int( | ||
np.random.random() * len(available_splitting_values) | ||
) | ||
split_value = available_splitting_values[idx_selected_splitting_values] | ||
return split_value | ||
|
||
@staticmethod | ||
@njit | ||
def divide(available_splitting_values, split_value): | ||
return available_splitting_values <= split_value | ||
|
||
|
||
class OneHotSplitRule(SplitRule): | ||
"""Choose a single categorical value and branch on if the variable is that value or not""" | ||
|
||
@staticmethod | ||
def get_split_value(available_splitting_values): | ||
split_value = None | ||
if available_splitting_values.size > 1 and not np.all( | ||
available_splitting_values == available_splitting_values[0] | ||
): | ||
idx_selected_splitting_values = int( | ||
np.random.random() * len(available_splitting_values) | ||
) | ||
split_value = available_splitting_values[idx_selected_splitting_values] | ||
return split_value | ||
|
||
@staticmethod | ||
@njit | ||
def divide(available_splitting_values, split_value): | ||
return available_splitting_values == split_value | ||
|
||
|
||
class SubsetSplitRule(SplitRule): | ||
""" | ||
Choose a random subset of the categorical values and branch on belonging to that set. | ||
This is the approach taken by Sameer K. Deshpande. | ||
flexBART: Flexible Bayesian regression trees with categorical predictors. arXiv, | ||
`link <https://arxiv.org/abs/2211.04459>`__ | ||
""" | ||
|
||
@staticmethod | ||
def get_split_value(available_splitting_values): | ||
split_value = None | ||
if available_splitting_values.size > 1 and not np.all( | ||
available_splitting_values == available_splitting_values[0] | ||
): | ||
unique_values = np.unique(available_splitting_values) | ||
while True: | ||
sample = np.random.randint(0, 2, size=len(unique_values)).astype(bool) | ||
if np.any(sample): | ||
break | ||
split_value = unique_values[sample] | ||
return split_value | ||
|
||
@staticmethod | ||
def divide(available_splitting_values, split_value): | ||
return np.isin(available_splitting_values, split_value) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add tests for this module?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can try. Don't have much experience with pytest but I can hopefully figure it out :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tests in https://github.com/pymc-devs/pymc-bart/blob/main/tests/test_tree.py are probably the simplest ones in PyMC-BART, you can try following a similar pattern.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added basic functionality tests to https://github.com/velochy/pymc-bart/blob/main/tests/test_split_rules.py