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
6 changes: 3 additions & 3 deletions Orange/widgets/unsupervised/owtsne.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ class Information(OWDataProjectionWidget.Information):

class Error(OWDataProjectionWidget.Error):
not_enough_rows = Msg("Input data needs at least 2 rows")
not_enough_cols = Msg("Input data needs at least 2 attributes")
constant_data = Msg("Input data is constant")
no_attributes = Msg("Data has no attributes")
no_valid_data = Msg("No projection due to no valid data")

def __init__(self):
Expand Down Expand Up @@ -387,8 +387,8 @@ def error(err):
if len(self.data) < 2:
error(self.Error.not_enough_rows)

elif not self.data.domain.attributes:
error(self.Error.no_attributes)
elif len(self.data.domain.attributes) < 2:
error(self.Error.not_enough_cols)

elif not self.data.is_sparse():
if np.all(~np.isfinite(self.data.X)):
Expand Down
44 changes: 26 additions & 18 deletions Orange/widgets/unsupervised/tests/test_owtsne.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,49 +70,57 @@ def restore_mocked_functions(self):

def test_wrong_input(self):
# no data
self.data = None
self.send_signal(self.widget.Inputs.data, self.data)
data = None
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNone(self.widget.data)

# <2 rows
self.data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1']])
self.send_signal(self.widget.Inputs.data, self.data)
data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1']])
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNone(self.widget.data)
self.assertTrue(self.widget.Error.not_enough_rows.is_shown())

# no attributes
self.data = Table.from_list(self.empty_domain, [['STG1']] * 2)
self.send_signal(self.widget.Inputs.data, self.data)
data = Table.from_list(self.empty_domain, [['STG1']] * 2)
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNone(self.widget.data)
self.assertTrue(self.widget.Error.no_attributes.is_shown())
self.assertTrue(self.widget.Error.not_enough_cols.is_shown())

# one attributes
data = Table.from_list(self.empty_domain, [[1, 'STG1'],
[2, 'STG1']])
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNone(self.widget.data)
self.assertTrue(self.widget.Error.not_enough_cols.is_shown())

# constant data
self.data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1']] * 2)
self.send_signal(self.widget.Inputs.data, self.data)
data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1']] * 2)
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNone(self.widget.data)
self.assertTrue(self.widget.Error.constant_data.is_shown())

# correct input
self.data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1'],
[5, 4, 3, 2, 1, 'STG1']])
self.send_signal(self.widget.Inputs.data, self.data)
data = Table.from_list(self.domain, [[1, 2, 3, 4, 5, 'STG1'],
[5, 4, 3, 2, 1, 'STG1']])
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()
self.assertIsNotNone(self.widget.data)
self.assertFalse(self.widget.Error.not_enough_rows.is_shown())
self.assertFalse(self.widget.Error.no_attributes.is_shown())
self.assertFalse(self.widget.Error.not_enough_cols.is_shown())
self.assertFalse(self.widget.Error.constant_data.is_shown())

def test_input(self):
self.data = Table.from_list(self.domain, [[1, 1, 1, 1, 1, 'STG1'],
[2, 2, 2, 2, 2, 'STG1'],
[4, 4, 4, 4, 4, 'STG2'],
[5, 5, 5, 5, 5, 'STG2']])
data = Table.from_list(self.domain, [[1, 1, 1, 1, 1, 'STG1'],
[2, 2, 2, 2, 2, 'STG1'],
[4, 4, 4, 4, 4, 'STG2'],
[5, 5, 5, 5, 5, 'STG2']])

self.send_signal(self.widget.Inputs.data, self.data)
self.send_signal(self.widget.Inputs.data, data)
self.wait_until_stop_blocking()

def test_attr_models(self):
Expand Down