Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions python/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

**Features**

- Genomic intervals returned by python functions are now namedtuples, allowing ``.left``
``.right`` and ``.span`` usage (:user:`hyanwong`, :issue:`784`, :pr:`786`, :pr:`811`)

- :issue:`832` - Add ``metadata_bytes`` method to allow access to raw
TableCollection metadata (:user:`benjeffery`, :pr:`842`)

Expand Down
19 changes: 13 additions & 6 deletions python/tests/test_highlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2363,12 +2363,19 @@ def test_seek(self):
self.assertRaises(ValueError, tree.seek, bad_position)

def test_interval(self):
ts = msprime.simulate(10)
tree = ts.first()
self.assertEqual(tree.interval[0], 0)
self.assertEqual(tree.interval.left, 0)
self.assertEqual(tree.interval[1], 1)
self.assertEqual(tree.interval.right, 1)
ts = msprime.simulate(10, recombination_rate=1, random_seed=1)
self.assertGreater(ts.num_trees, 1)
breakpoints = list(ts.breakpoints())
self.assertEqual(breakpoints[0], 0)
self.assertEqual(breakpoints[-1], ts.sequence_length)
for i, tree in enumerate(ts.trees()):
self.assertAlmostEqual(tree.interval[0], breakpoints[i])
self.assertAlmostEqual(tree.interval.left, breakpoints[i])
self.assertAlmostEqual(tree.interval[1], breakpoints[i + 1])
self.assertAlmostEqual(tree.interval.right, breakpoints[i + 1])
self.assertAlmostEqual(
tree.interval.span, breakpoints[i + 1] - breakpoints[i]
)

def verify_empty_tree(self, tree):
ts = tree.tree_sequence
Expand Down
8 changes: 7 additions & 1 deletion python/tskit/trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@
"CoalescenceRecord", ["left", "right", "node", "children", "time", "population"]
)

Interval = collections.namedtuple("Interval", ["left", "right"])
BaseInterval = collections.namedtuple("BaseInterval", ["left", "right"])


class Interval(BaseInterval):
@property
def span(self):
return self.right - self.left


# TODO this interface is rubbish. Should have much better printing options.
Expand Down