Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 24 additions & 15 deletions Orange/widgets/data/owoutliers.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class OWOutliers(widget.OWWidget):
class Error(widget.OWWidget.Error):
singular_cov = Msg("Singular covariance matrix.")
multiclass_error = Msg("Multiple class data is not supported")
memory_error = Msg("Not enough memory")

def __init__(self):
super().__init__()
Expand Down Expand Up @@ -137,6 +138,28 @@ def set_data(self, dataset):

self.commit()

def _get_outliers(self):
try:
y_pred = self.detect_outliers()
except ValueError:
self.Error.singular_cov()
self.in_out_info_label.setText(self.in_out_info_default)
except MemoryError:
self.Error.memory_error()
return None, None
else:
inliers_ind = np.where(y_pred == 1)[0]
outliers_ind = np.where(y_pred == -1)[0]
inliers = self.new_data[inliers_ind]
outliers = self.new_data[outliers_ind]
self.in_out_info_label.setText(
"{} inliers, {} outliers".format(len(inliers),
len(outliers)))
self.n_inliers = len(inliers)
self.n_outliers = len(outliers)

return inliers, outliers

def commit(self):
self.clear_messages()
inliers = outliers = None
Expand All @@ -145,21 +168,7 @@ def commit(self):
if self.data.Y.ndim > 1:
self.Error.multiclass_error()
else:
try:
y_pred = self.detect_outliers()
except ValueError:
self.Error.singular_cov()
self.in_out_info_label.setText(self.in_out_info_default)
else:
inliers_ind = np.where(y_pred == 1)[0]
outliers_ind = np.where(y_pred == -1)[0]
inliers = self.new_data[inliers_ind]
outliers = self.new_data[outliers_ind]
self.in_out_info_label.setText(
"{} inliers, {} outliers".format(len(inliers),
len(outliers)))
self.n_inliers = len(inliers)
self.n_outliers = len(outliers)
inliers, outliers = self._get_outliers()

self.send("Inliers", inliers)
self.send("Outliers", outliers)
Expand Down
15 changes: 15 additions & 0 deletions Orange/widgets/data/tests/test_owoutliers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Test methods with long descriptive names can omit docstrings
# pylint: disable=missing-docstring

import unittest

import numpy as np

from Orange.data import Table, Domain, ContinuousVariable, DiscreteVariable
Expand Down Expand Up @@ -36,3 +38,16 @@ def test_multiclass(self):
self.assertTrue(self.widget.Error.multiclass_error.is_shown())
self.send_signal("Data", None)
self.assertFalse(self.widget.Error.multiclass_error.is_shown())

def test_memory_error(self):
"""
Handling memory error.
GH-2374
"""
data = Table("iris")[::3]
self.assertFalse(self.widget.Error.memory_error.is_shown())
with unittest.mock.patch(
"Orange.widgets.data.owoutliers.OWOutliers.detect_outliers",
side_effect=MemoryError):
self.send_signal("Data", data)
self.assertTrue(self.widget.Error.memory_error.is_shown())