Merge pull request #5006 from ajdapretnar/neighbor-subset

OWNeighbors: copy original ids to neighbor output

Author: janezd

Orange/widgets/data/owneighbors.py

@@ -182,6 +182,7 @@ def _data_with_similarity(self, indices):
         if data.domain.metas:
             data_metas = np.hstack((data.metas[indices], data_metas))
         neighbors = Table(domain, data.X[indices], data.Y[indices], data_metas)
+        neighbors.ids = data.ids[indices]
         neighbors.attributes = self.data.attributes
         return neighbors
 

Orange/widgets/data/tests/test_owneighbors.py

@@ -54,11 +54,14 @@ def test_output_neighbors(self):
         """Check if neighbors are on the output after apply"""
         widget = self.widget
         self.assertIsNone(self.get_output("Neighbors"))
-        self.send_signal(widget.Inputs.data, self.iris)
-        self.send_signal(widget.Inputs.reference, self.iris[:10])
+        self.send_signals(((widget.Inputs.data, self.iris),
+                           (widget.Inputs.reference, self.iris[:10])))
         widget.apply_button.button.click()
         self.assertIsNotNone(self.get_output("Neighbors"))
         self.assertIsInstance(self.get_output("Neighbors"), Table)
+        self.assertTrue(all([i in self.iris.ids for i in
+                             self.get_output(widget.Outputs.data).ids])
+                        )
 
     def test_settings(self):
         """Check neighbors for various distance metrics"""