Fix NamedTuple equality for tuple comparison.

PiperOrigin-RevId: 673512157

connectomics/common/tuples.py

@@ -34,9 +34,10 @@ class XYZ(Generic[T], NamedTuple):
   z: T
 
   def __eq__(self, other):
-    if not (isinstance(other, XYZ) or isinstance(other, ZYX)):
-      return False
-    return self.x == other.x and self.y == other.y and self.z == other.z
+    if isinstance(other, XYZ) or isinstance(other, ZYX):
+      return self.x == other.x and self.y == other.y and self.z == other.z
+    # Defer to tuple equality.
+    return self[:] == other
 
   @property
   def xyz(self) -> 'XYZ[T]':
@@ -69,9 +70,10 @@ def zyx(self) -> 'ZYX[T]':
     return self
 
   def __eq__(self, other):
-    if not (isinstance(other, XYZ) or isinstance(other, ZYX)):
-      return False
-    return self.x == other.x and self.y == other.y and self.z == other.z
+    if isinstance(other, XYZ) or isinstance(other, ZYX):
+      return self.x == other.x and self.y == other.y and self.z == other.z
+    # Defer to tuple equality.
+    return self[:] == other
 
 
 class XYZC(Generic[T], NamedTuple):
@@ -83,14 +85,15 @@ class XYZC(Generic[T], NamedTuple):
   c: T
 
   def __eq__(self, other):
-    if not (isinstance(other, XYZC) or isinstance(other, CZYX)):
-      return False
-    return (
-        self.x == other.x
-        and self.y == other.y
-        and self.z == other.z
-        and self.c == other.c
-    )
+    if isinstance(other, XYZC) or isinstance(other, CZYX):
+      return (
+          self.x == other.x
+          and self.y == other.y
+          and self.z == other.z
+          and self.c == other.c
+      )
+    # Defer to tuple equality.
+    return self[:] == other
 
   @property
   def xyz(self) -> 'XYZ[T]':
@@ -135,14 +138,15 @@ def czyx(self) -> 'CZYX[T]':
     return self
 
   def __eq__(self, other):
-    if not (isinstance(other, XYZC) or isinstance(other, CZYX)):
-      return False
-    return (
-        self.x == other.x
-        and self.y == other.y
-        and self.z == other.z
-        and self.c == other.c
-    )
+    if isinstance(other, XYZC) or isinstance(other, CZYX):
+      return (
+          self.x == other.x
+          and self.y == other.y
+          and self.z == other.z
+          and self.c == other.c
+      )
+    # Defer to tuple equality.
+    return self[:] == other
 
 
 def named_tuple_field(

connectomics/common/tuples_test.py

@@ -49,6 +49,9 @@ def test_xyz_zyx(self):
     self.assertEqual(zyx[1], y)
     self.assertEqual(zyx[2], x)
 
+    self.assertEqual(xyz, (x, y, z))
+    self.assertEqual(zyx, (z, y, x))
+
   def test_xyzc_czyx(self):
     x, y, z, c = [1, 2, 3, 4]
     xyz = tuples.XYZ(x, y, z)
@@ -86,6 +89,9 @@ def test_xyzc_czyx(self):
     self.assertEqual(czyx[2], y)
     self.assertEqual(czyx[3], x)
 
+    self.assertEqual(xyzc, (x, y, z, c))
+    self.assertEqual(czyx, (c, z, y, x))
+
 
 if __name__ == '__main__':
   absltest.main()