Skip to content

Correctly decode tszip cols#213

Merged
benjeffery merged 2 commits intotskit-dev:mainfrom
benjeffery:fix-quant-cols
Oct 24, 2024
Merged

Correctly decode tszip cols#213
benjeffery merged 2 commits intotskit-dev:mainfrom
benjeffery:fix-quant-cols

Conversation

@benjeffery
Copy link
Copy Markdown
Member

@benjeffery benjeffery commented Oct 23, 2024

Fixes #190
Fixed other odd columns too and added tests for all columns.

@github-actions
Copy link
Copy Markdown

Automated Screenshots

These screenshots are automatically updated as the PR changes.

Click to view screenshots

edges.png

edges.png

mutations-popup.png

mutations-popup.png

mutations.png

mutations.png

nodes.png

nodes.png

out_edges.png

out_edges.png

out_mutations.png

out_mutations.png

out_nodes.png

out_nodes.png

overview.png

overview.png

tables.png

tables.png

trees.png

trees.png

github-actions Bot pushed a commit that referenced this pull request Oct 23, 2024
@coveralls
Copy link
Copy Markdown

coveralls commented Oct 23, 2024

Pull Request Test Coverage Report for Build 11497469628

Details

  • 14 of 14 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.08%) to 90.369%

Totals Coverage Status
Change from base Build 11486973043: 0.08%
Covered Lines: 760
Relevant Lines: 841

💛 - Coveralls

Copy link
Copy Markdown
Member

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why we need to do this tbh - shouldn't we let tszip handle this? If we do

ts = tszip.load(tsbrowse_path)
root = zarr.open(tsbrowse_path)
# e.g.
edges_df = {
     "left": ts.edges_left,
     "right": ts.edges_right, 
      ...
     "extra_col_1": root["edges"]["extra_col_1"]
 } 

then we let tszip deal with these details, and we don't become depending on an implementation detail of tszip?

Comment thread tsbrowse/model.py
github-actions Bot pushed a commit that referenced this pull request Oct 24, 2024
Copy link
Copy Markdown
Member

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor perf issue

Comment thread tsbrowse/model.py Outdated
"migrations",
"provenances",
]:
ts_table = getattr(self.ts.tables, table_name)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's generating a fresh copy of the tables each time. Get a reference to the tables before the loop body

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

github-actions Bot pushed a commit that referenced this pull request Oct 24, 2024
@benjeffery benjeffery merged commit 0452a25 into tskit-dev:main Oct 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

edges table viewer: incorrect right coordinate displayed?

3 participants