Merge pull request #3555 from PrimozGodec/neighbours-domains

Fix: Neighbours: Compare tables with domains that only differ in metas and class_var

Author: janezd

Orange/widgets/data/owneighbors.py

@@ -44,7 +44,7 @@ class Warning(OWWidget.Warning):
             Msg("Every data instance is same as some reference")
 
     class Error(OWWidget.Error):
-        diff_domains = Msg("Data and reference have different domains.")
+        diff_domains = Msg("Data and reference have different features")
 
     n_neighbors = Setting(10)
     distance_index = Setting(0)
@@ -115,14 +115,21 @@ def compute_distances(self):
                 or self.reference is None or len(self.reference) == 0:
             self.distances = None
             return
-        if self.reference.domain != self.data.domain:
+        if set(self.reference.domain.attributes) != \
+                set(self.data.domain.attributes):
             self.Error.diff_domains()
             self.distances = None
             return
 
         distance = METRICS[self.distance_index][1]
         n_ref = len(self.reference)
-        all_data = Table.concatenate([self.reference, self.data], 0)
+
+        # comparing only attributes, no metas and class-vars
+        new_domain = Domain(self.data.domain.attributes)
+        reference = self.reference.transform(new_domain)
+        data = self.data.transform(new_domain)
+
+        all_data = Table.concatenate([reference, data], 0)
         pp_all_data = Impute()(RemoveNaNColumns()(all_data))
         pp_reference, pp_data = pp_all_data[:n_ref], pp_all_data[n_ref:]
         self.distances = distance(pp_data, pp_reference).min(axis=1)

Orange/widgets/data/tests/test_owneighbors.py

@@ -396,6 +396,63 @@ def test_different_domains(self):
         self.send_signal(w.Inputs.reference, None)
         self.assertFalse(w.Error.diff_domains.is_shown())
 
+    def test_different_metas(self):
+        """
+        Test weather widget do not show error when data and a reference have
+        domain that differ only in metas
+        """
+        w = self.widget
+
+        domain = Domain([ContinuousVariable("a"), ContinuousVariable("b")],
+                        metas=[ContinuousVariable("c")])
+        data = Table(
+            domain, np.random.rand(2, len(domain.attributes)),
+            metas=np.random.rand(2, len(domain.metas)))
+
+        # same domain with same metas no error
+        self.send_signal(w.Inputs.data, data)
+        self.send_signal(w.Inputs.reference, data[:1])
+        self.assertFalse(w.Error.diff_domains.is_shown())
+
+        # same domain with different metas no error
+        domain_ref = Domain(domain.attributes,
+                            metas=[ContinuousVariable("d")])
+        reference = Table(
+            domain_ref, np.random.rand(1, len(domain_ref.attributes)),
+            metas=np.random.rand(1, len(domain.metas)))
+        self.send_signal(w.Inputs.data, data)
+        self.send_signal(w.Inputs.reference, reference)
+        self.assertFalse(w.Error.diff_domains.is_shown())
+
+        # same domain with different order - no error
+        domain_ref = Domain(domain.attributes[::-1])
+        reference = Table(
+            domain_ref, np.random.rand(1, len(domain_ref.attributes)))
+        self.send_signal(w.Inputs.data, data)
+        self.send_signal(w.Inputs.reference, reference)
+        self.assertFalse(w.Error.diff_domains.is_shown())
+
+        # same domain with different number of metas no error
+        domain_ref = Domain(
+            domain.attributes,
+            metas=[ContinuousVariable("d"), ContinuousVariable("e")])
+        reference = Table(
+            domain_ref, np.random.rand(1, len(domain_ref.attributes)),
+            metas=np.random.rand(1, len(domain_ref.metas)))
+        self.send_signal(w.Inputs.data, data)
+        self.send_signal(w.Inputs.reference, reference)
+        self.assertFalse(w.Error.diff_domains.is_shown())
+
+        # different domain with same metas - error shown
+        domain_ref = Domain(domain.attributes + (ContinuousVariable("e"),),
+                            metas=[ContinuousVariable("c")])
+        reference = Table(
+            domain_ref, np.random.rand(1, len(domain_ref.attributes)),
+            metas=np.random.rand(1, len(domain_ref.metas)))
+        self.send_signal(w.Inputs.data, data)
+        self.send_signal(w.Inputs.reference, reference)
+        self.assertTrue(w.Error.diff_domains.is_shown())
+
 
 if __name__ == "__main__":
     unittest.main()