Skip to content

[FIX] OWDistances: Mahalanobis wrong dimensions notification. #1762

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
astaric merged 2 commits into from
Nov 18, 2016
Merged

[FIX] OWDistances: Mahalanobis wrong dimensions notification. #1762

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
c63965a
[FIX] OWDistances: Mahalanobis wrong dimensions notification.
acopar Nov 18, 2016
d257f5c
TestOWDistances: Test for mahalanobis error message.
acopar Nov 18, 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
9 changes: 9 additions & 0 deletions Orange/widgets/unsupervised/owdistances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Error(OWWidget.Error):
no_continuous_features = Msg("No continuous features")
dense_metric_sparse_data = Msg("Selected metric does not support sparse data")
empty_data = Msg("Empty data (shape = {})")
too_few_observations = Msg("Too few observations for the number of dimensions")

class Warning(OWWidget.Warning):
ignoring_discrete = Msg("Ignoring discrete features")
Expand Down Expand Up @@ -129,6 +130,14 @@ def compute_distances(self, metric, data):
self.Error.empty_data(data.X.shape)
return

if isinstance(metric, distance.MahalanobisDistance):
n, m = data.X.shape
if self.axis == 1:
n, m = m, n
if n <= m:
self.Error.too_few_observations()
return

if isinstance(metric, distance.MahalanobisDistance):
# Mahalanobis distance has to be trained before it can be used
# to compute distances
Expand Down
8 changes: 7 additions & 1 deletion Orange/widgets/unsupervised/tests/test_owdistances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np

from Orange.data import Table
from Orange.distance import MahalanobisDistance
from Orange.distance import MahalanobisDistance, Mahalanobis
from Orange.widgets.unsupervised.owdistances import OWDistances, METRICS
from Orange.widgets.tests.base import WidgetTest

Expand Down Expand Up @@ -40,3 +40,9 @@ def test_error_message(self):
self.assertTrue(self.widget.Error.no_continuous_features.is_shown())
self.send_signal("Data", None)
self.assertFalse(self.widget.Error.no_continuous_features.is_shown())

def test_mahalanobis_error(self):
self.widget.axis = 1
self.send_signal("Data", self.iris)
self.widget.compute_distances(Mahalanobis, self.iris)
self.assertTrue(self.widget.Error.too_few_observations.is_shown())
Copy link
Copy Markdown
Member

@astaric astaric Nov 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please configure PyCharm to always include new line on the last line of file?

http://stackoverflow.com/questions/36043061/automatically-add-newline-on-save-in-pycharm