Skip to content

Allow is_unknown_time to work on arrays #857

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

Jump to bottom
Merged
merged 1 commit into from
Sep 23, 2020
Merged

Allow is_unknown_time to work on arrays #857

merged 1 commit into from
Sep 23, 2020

Conversation

@benjeffery
Copy link
Member

@benjeffery benjeffery commented Sep 22, 2020

Fixes #814

@hyanwong
Copy link
Member

hyanwong commented Sep 22, 2020

LGTM!

@codecov
Copy link

codecov bot commented Sep 22, 2020 •
edited
Loading

Codecov Report

Merging #857 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #857      +/-   ##
==========================================
- Coverage   93.52%   93.52%   -0.01%     
==========================================
  Files          24       24              
  Lines       19928    19927       -1     
  Branches      789      789              
==========================================
- Hits        18637    18636       -1     
  Misses       1259     1259              
  Partials       32       32
Impacted Files Coverage Δ
python/tskit/util.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2b6730...dc51be4. Read the comment docs.

jeromekelleher
jeromekelleher reviewed Sep 22, 2020
View reviewed changes
Copy link
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.

LGTM, minor comments.

python/tskit/util.py Outdated
"""
return struct.pack(">d", UNKNOWN_TIME) == struct.pack(">d", time)
try:
return struct.pack(">d", UNKNOWN_TIME) == struct.pack(">d", time)
Copy link
Member

@jeromekelleher jeromekelleher Sep 22, 2020

Choose a reason for hiding this comment

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

Do we need to first part now? I thought numpy would cast to a 1-element array.

Copy link
Member Author

@benjeffery benjeffery Sep 23, 2020

Choose a reason for hiding this comment

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

Seems good - I get a bool back! Nice.

@benjeffery
Copy link
Member Author

benjeffery commented Sep 23, 2020

@jeromekelleher All fixed up.

@jeromekelleher
Copy link
Member

jeromekelleher commented Sep 23, 2020

Issues on Windows?

@benjeffery
Copy link
Member Author

benjeffery commented Sep 23, 2020

Huh, weird. Looking into it.

@benjeffery
Copy link
Member Author

benjeffery commented Sep 23, 2020

@jeromekelleher Fixed by forcing the dtype of the array, means that None now gives false instead of an error, but it feels more correct to do that anyway.

jeromekelleher
jeromekelleher reviewed Sep 23, 2020
View reviewed changes
@benjeffery
Copy link
Member Author

benjeffery commented Sep 23, 2020

@jeromekelleher Fixed my pub-induced error.

@mergify mergify bot merged commit 3a16d24 into tskit-dev:master Sep 23, 2020
@benjeffery benjeffery deleted the is-unknown-array branch September 24, 2020 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jeromekelleher jeromekelleher jeromekelleher approved these changes

@hyanwong hyanwong hyanwong approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

is_unknown_time for numpy arrays

3 participants

@benjeffery @hyanwong @jeromekelleher