Merge pull request #4957 from PrimozGodec/fix-merge-data

[FIX] Fix variables equality and hashes

Author: janezd

Orange/data/tests/test_variable.py

@@ -215,18 +215,25 @@ def test_hash(self):
 
     def test_hash_eq(self):
         a = ContinuousVariable("a")
+        a1 = ContinuousVariable("a")
         b1 = ContinuousVariable("b", compute_value=Identity(a))
         b2 = ContinuousVariable("b2", compute_value=Identity(b1))
         b3 = ContinuousVariable("b")
-        self.assertEqual(a, b2)
-        self.assertEqual(b1, b2)
-        self.assertEqual(a, b1)
+        c1 = ContinuousVariable("c", compute_value=Identity(a))
+        c2 = ContinuousVariable("c", compute_value=Identity(a))
+        self.assertNotEqual(a, b2)
+        self.assertNotEqual(b1, b2)
+        self.assertNotEqual(a, b1)
         self.assertNotEqual(b1, b3)
+        self.assertEqual(a, a1)
+        self.assertEqual(c1, c2)
 
-        self.assertEqual(hash(a), hash(b2))
-        self.assertEqual(hash(b1), hash(b2))
-        self.assertEqual(hash(a), hash(b1))
+        self.assertNotEqual(hash(a), hash(b2))
+        self.assertNotEqual(hash(b1), hash(b2))
+        self.assertNotEqual(hash(a), hash(b1))
         self.assertNotEqual(hash(b1), hash(b3))
+        self.assertEqual(hash(a), hash(a1))
+        self.assertEqual(hash(c1), hash(c2))
 
 
 def variabletest(varcls):

Orange/data/variable.py

@@ -353,12 +353,15 @@ def __eq__(self, other):
         var1 = self._get_identical_source(self)
         var2 = self._get_identical_source(other)
         # pylint: disable=protected-access
-        return var1.name == var2.name \
-               and var1._compute_value == var2._compute_value
+        return (
+            self.name == other.name
+            and var1.name == var2.name
+            and var1._compute_value == var2._compute_value
+        )
 
     def __hash__(self):
         var = self._get_identical_source(self)
-        return hash((var.name, type(self), var._compute_value))
+        return hash((self.name, var.name, type(self), var._compute_value))
 
     @staticmethod
     def _get_identical_source(var):

Orange/tests/test_domain.py

@@ -544,6 +544,22 @@ def test_domain_conversion_sparsity(self):
         self.assertTrue(conversion.sparse_Y)
         self.assertFalse(conversion.sparse_metas)
 
+    def test_get_item_similar_vars(self):
+        a = DiscreteVariable("Cluster", values=["c"])
+        var1 = a.renamed("Cluster x")
+        var2 = DiscreteVariable("Cluster", values=["a", "b"])
+
+        domain = Domain(
+            [],
+            metas=[var1, var2]
+        )
+        # pylint: disable=protected-access
+        self.assertDictEqual(
+            {-1: -1, -2: -2, var1: -1, var2: -2, var1.name: -1, var2.name: -2},
+            domain._indices
+        )
+        self.assertIs(domain[domain.metas[0]], domain.metas[0])
+
 
 class TestDomainFilter(unittest.TestCase):
     def setUp(self):