Skip to content

[ENH] CN2RuleViewer: Output sample of training data in absence of separate data #1667

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
VesnaT merged 2 commits into from
Oct 19, 2016
Merged

[ENH] CN2RuleViewer: Output sample of training data in absence of separate data #1667

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
eb4551c
CN2RuleViewer: Output sample of training data when separate data is n…
janezd Oct 15, 2016
79510f5
CN2 tests: Add 'instances' attribute to the model used for testing
janezd Oct 17, 2016
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: 6 additions & 6 deletions Orange/widgets/visualize/owruleviewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,19 @@ def commit(self):
data_output = None
self._save_selected(actual=True)

data = self.data or self.classifier and self.classifier.instances
if (self.selected is not None and
self.data is not None and
data is not None and
self.classifier is not None and
self.data.domain.attributes ==
data.domain.attributes ==
self.classifier.original_domain.attributes):

status = np.ones(self.data.X.shape[0], dtype=bool)
status = np.ones(data.X.shape[0], dtype=bool)
for i in self.selected:
rule = self.classifier.rule_list[i]
status &= rule.evaluate_data(self.data.X)
status &= rule.evaluate_data(data.X)

data_output = self.data.from_table_rows(
self.data, status.nonzero()[0])
data_output = data.from_table_rows(data, status.nonzero()[0])

self.send(OWRuleViewer.data_output_identifier, data_output)

Expand Down
3 changes: 3 additions & 0 deletions Orange/widgets/visualize/tests/test_owruleviewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ def setUp(self):
self.titanic = Table('titanic')
self.learner = CN2Learner()
self.classifier = self.learner(self.titanic)
# CN2Learner does not add `instances` attribute to the model, but
# the Rules widget does. We simulate the model we get from the widget.
self.classifier.instances = self.titanic
self.widget = self.create_widget(OWRuleViewer)

def test_set_data(self):
Expand Down