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.

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

Jump to bottom

[FIX] Tree: Reintroduce preprocessors. #2566

Merged
merged 2 commits into from
Sep 14, 2017
Merged

[FIX] Tree: Reintroduce preprocessors. #2566

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
9ed8b9c
Explicitly add preprocessors to the list of parameters in the constru…
thocevar Sep 8, 2017
445dfd1
Add test
astaric Sep 13, 2017
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
4 changes: 2 additions & 2 deletions Orange/classification/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class TreeLearner(Learner):
def __init__(
self, *args, binarize=False, max_depth=None,
min_samples_leaf=1, min_samples_split=2, sufficient_majority=0.95,
**kwargs):
super().__init__(*args, **kwargs)
preprocessors=None, **kwargs):
super().__init__(preprocessors=preprocessors)
self.params = {}
self.binarize = self.params['binarize'] = binarize
self.min_samples_leaf = self.params['min_samples_leaf'] = min_samples_leaf
Expand Down
15 changes: 13 additions & 2 deletions Orange/tests/test_tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
# pylint: disable=missing-docstring

import unittest
from unittest.mock import Mock

import numpy as np
import sklearn.tree as skl_tree
from sklearn.tree._tree import TREE_LEAF

from Orange.data import Table
from Orange.classification import SklTreeLearner
from Orange.classification import SklTreeLearner, TreeLearner
from Orange.regression import SklTreeRegressionLearner


class TestTreeLearner(unittest.TestCase):
class TestSklTreeLearner(unittest.TestCase):
def test_classification(self):
table = Table('iris')
learn = SklTreeLearner()
Expand All @@ -28,6 +29,16 @@ def test_regression(self):
self.assertTrue(np.all(table.Y.flatten() == pred))


class TestTreeLearner(unittest.TestCase):
def test_uses_preprocessors(self):
iris = Table('iris')
mock_preprocessor = Mock(return_value=iris)

tree = TreeLearner(preprocessors=[mock_preprocessor])
tree(iris)
mock_preprocessor.assert_called_with(iris)


class TestDecisionTreeClassifier(unittest.TestCase):
@classmethod
def setUpClass(cls):
Expand Down