From da0632ccb49809d6ed1d4c0176dcf256af6f7a66 Mon Sep 17 00:00:00 2001 From: BlazZupan Date: Sun, 8 Jan 2017 20:36:06 +0100 Subject: [PATCH 1/2] Copy data attributes for annotated data set. --- Orange/widgets/utils/annotated_data.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Orange/widgets/utils/annotated_data.py b/Orange/widgets/utils/annotated_data.py index a5c6d1ae872..1f7d477d66e 100644 --- a/Orange/widgets/utils/annotated_data.py +++ b/Orange/widgets/utils/annotated_data.py @@ -41,5 +41,7 @@ def create_annotated_table(data, selected_indices): annotated = np.zeros((len(data), 1)) if selected_indices is not None: annotated[selected_indices] = 1 - return Table(domain, data.X, data.Y, - metas=np.hstack((data.metas, annotated))) + table = Table(domain, data.X, data.Y, + metas=np.hstack((data.metas, annotated))) + table.attributes = data.attributes + return table From 398501c00a98194c83d5010b44caa1b6a86250de Mon Sep 17 00:00:00 2001 From: Vesna Tanko Date: Mon, 9 Jan 2017 14:04:28 +0100 Subject: [PATCH 2/2] Add tests --- Orange/widgets/tests/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Orange/widgets/tests/base.py b/Orange/widgets/tests/base.py index 1399768c52d..0e15ba3365d 100644 --- a/Orange/widgets/tests/base.py +++ b/Orange/widgets/tests/base.py @@ -539,10 +539,12 @@ def test_outputs(self): self.same_input_output_domain) np.testing.assert_array_equal(selected.X[:, :n_attr], self.data.X[selected_indices]) + self.assertEqual(selected.attributes, self.data.attributes) # check annotated data output annotated = self.get_output(ANNOTATED_DATA_SIGNAL_NAME) self.assertEqual(n_sel, np.sum([i[feature_name] for i in annotated])) + self.assertEqual(annotated.attributes, self.data.attributes) # compare selected and annotated data domains self._compare_selected_annotated_domains(selected, annotated)