Skip to content

[FIX] OWMergeData removes table meta attributes #3474

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
janezd merged 5 commits into from
Dec 21, 2018
Merged

[FIX] OWMergeData removes table meta attributes #3474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae9b5b0
append data instead of create new
AndrejaKovacic Dec 7, 2018
70231fb
copy table, add test for id
AndrejaKovacic Dec 14, 2018
5a55dfc
switch to from_numpy
AndrejaKovacic Dec 21, 2018
0a3c7c4
added tests
AndrejaKovacic Dec 21, 2018
383c2aa
add default val
AndrejaKovacic Dec 21, 2018
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: 5 additions & 1 deletion Orange/widgets/data/owmergedata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,11 @@ def _join_table_by_indices(self, reduced_extra, indices):
string_cols = [i for i, var in enumerate(domain.metas) if var.is_string]
metas = self._join_array_by_indices(
self.data.metas, reduced_extra.metas, indices, string_cols)
return Orange.data.Table.from_numpy(domain, X, Y, metas)
table = Orange.data.Table.from_numpy(domain, X, Y, metas)
table.name = getattr(self.data, 'name', '')
table.attributes = getattr(self.data, 'attributes', {})
table.ids = self.data.ids
return table

@staticmethod
def _join_array_by_indices(left, right, indices, string_cols=None):
Expand Down
10 changes: 9 additions & 1 deletion Orange/widgets/data/tests/test_owmergedata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ def setUpClass(cls):
yB = np.array([np.nan, 1, 0])
metasB = np.array([[np.nan], [1], [0]]).astype(object)
cls.dataA = Table(domainA, XA, yA, metasA)
cls.dataA.name = 'dataA'
cls.dataA.attributes = 'dataA attributes'
cls.dataB = Table(domainB, XB, yB, metasB)
cls.dataB.name = 'dataB'
cls.dataB.attributes = 'dataB attributes'

def setUp(self):
self.widget = self.create_widget(OWMergeData)
Expand Down Expand Up @@ -231,7 +235,11 @@ def test_output_merge_by_attribute_left(self):
self.widget.attr_augment_data = domainA[0]
self.widget.attr_augment_extra = domainB[0]
self.widget.commit()
self.assertTablesEqual(self.get_output(self.widget.Outputs.data), result)
output = self.get_output(self.widget.Outputs.data)
self.assertTablesEqual(output, result)
self.assertEqual(output.name, self.dataA.name)
np.testing.assert_array_equal(output.ids, self.dataA.ids)
self.assertEqual(output.attributes, self.dataA.attributes)

def test_output_merge_by_attribute_inner(self):
"""Check output for merging option 'Find matching rows' by attribute"""
Expand Down