Skip to content

compare indiv table rows and test #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2020
Merged

compare indiv table rows and test #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions python/tests/test_tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,16 +580,21 @@ def test_equality(self):
t2.set_columns(**input_data_copy)
self.assertEqual(t1, t2)
self.assertFalse(t1 != t2)
self.assertEqual(t1[0], t2[0])
col_copy += 1
t2.set_columns(**input_data_copy)
self.assertNotEqual(t1, t2)
self.assertNotEqual(t2, t1)
self.assertNotEqual(t1[0], t2[0])
self.assertTrue(t1[0] != t2[0])
self.assertTrue(t1[0] != [])
for list_col, offset_col in self.ragged_list_columns:
value = list_col.get_input(num_rows)
input_data_copy = dict(input_data)
input_data_copy[list_col.name] = value + 1
t2.set_columns(**input_data_copy)
self.assertNotEqual(t1, t2)
self.assertNotEqual(t1[0], t2[0])
value = list_col.get_input(num_rows + 1)
input_data_copy = dict(input_data)
input_data_copy[list_col.name] = value
Expand All @@ -600,6 +605,7 @@ def test_equality(self):
t2.set_columns(**input_data_copy)
self.assertNotEqual(t1, t2)
self.assertNotEqual(t2, t1)
self.assertNotEqual(t1[-1], t2[-1])
# Different types should always be unequal.
self.assertNotEqual(t1, None)
self.assertNotEqual(t1, [])
Expand Down
18 changes: 17 additions & 1 deletion python/tskit/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,28 @@
attr_options = {"slots": True, "frozen": True, "auto_attribs": True}


@attr.s(**attr_options)
# note: soon attrs will deprecate cmp; we just need to change this argument to eq
@attr.s(cmp=False, **attr_options)
class IndividualTableRow:
flags: int
location: np.ndarray
metadata: bytes

def __eq__(self, other):
if not isinstance(other, type(self)):
return False
else:
return all(
(
self.flags == other.flags,
np.array_equal(self.location, other.location),
self.metadata == other.metadata,
)
)

def __neq__(self, other):
return not self.__eq__(other)


@attr.s(**attr_options)
class NodeTableRow:
Expand Down