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

[FIX] MDS: primitive metas, init_attr_values #2661

Merged
merged 1 commit into from
Oct 9, 2017
Merged

[FIX] MDS: primitive metas, init_attr_values #2661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions Orange/widgets/unsupervised/owmds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,16 +310,10 @@ def set_data(self, data):
if self.matrix is not None and data is not None and len(self.matrix) == len(data):
self.closeContext()
self.data = data
self.init_attr_values()
self.openContext(data)
else:
self._invalidated = True
if data is not None:
self._primitive_metas = tuple(a for a in data.domain.metas if a.is_primitive())
keys = [k for k, a in enumerate(data.domain.metas) if a.is_primitive()]
self._data_metas = data.metas[:, keys]
else:
self._primitive_metas = ()
self._data_metas = None

@Inputs.distances
def set_disimilarity(self, matrix):
Expand Down Expand Up @@ -653,12 +647,19 @@ def connect_pairs(self):
def _setup_plot(self, new=False):
emb_x, emb_y = self.embedding[:, 0], self.embedding[:, 1]
coords = np.vstack((emb_x, emb_y)).T

data = self.data

primitive_metas = tuple(a for a in data.domain.metas if a.is_primitive())
keys = [k for k, a in enumerate(data.domain.metas) if a.is_primitive()]
data_metas = data.metas[:, keys]

attributes = self.data.domain.attributes + (self.variable_x, self.variable_y) + \
self._primitive_metas
primitive_metas
domain = Domain(attributes=attributes,
class_vars=self.data.domain.class_vars)
if self._data_metas is not None:
data_x = (self.data.X, coords, self._data_metas)
if data_metas is not None:
data_x = (self.data.X, coords, data_metas)
else:
data_x = (self.data.X, coords)
data = Table.from_numpy(domain, X=np.hstack(data_x),
Expand Down