Skip to content
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.

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

Move fixes to filter_min_distance and 2d coordinate interpolation to v1.4. #251

Merged
merged 2 commits into from
Feb 21, 2023

Conversation

w-k-jones
Copy link
Member

This PR takes the same changes made in #244 and #250 and re-implements them on v1.4 to allow for a hotfix release. The logic tree in filter_min_distance has been simplified based on the suggestion of @lettlini in the review of #244

Note that filter_min_distance is not tested as comprehensively due to the missing tests that are implemented for v1.5

Hopefully this won't create merge conflicts for v1.5...

  • Have you followed our guidelines in CONTRIBUTING.md?
  • Have you self-reviewed your code and corrected any misspellings?
  • Have you written documentation that is easy to understand?
  • Have you written descriptive commit messages?
  • Have you added NumPy docstrings for newly added functions?
  • Have you formatted your code using black?
  • If you have introduced a new functionality, have you added adequate unit tests?
  • Have all tests passed in your local clone?
  • If you have introduced a new functionality, have you added an example notebook?
  • Have you kept your pull request small and limited so that it is easy to review?
  • Have the newest changes from this branch been merged?

@w-k-jones w-k-jones self-assigned this Feb 17, 2023
@w-k-jones w-k-jones added the bug Code that is failing or producing the wrong result label Feb 17, 2023
@w-k-jones w-k-jones added this to the Version 1.4.2 milestone Feb 17, 2023
@codecov
Copy link

codecov bot commented Feb 17, 2023

Codecov Report

Base: 35.76% // Head: 39.37% // Increases project coverage by +3.61% 🎉

Coverage data is based on head (8dcb567) compared to base (09b176b).
Patch coverage: 66.66% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           hotfix     #251      +/-   ##
==========================================
+ Coverage   35.76%   39.37%   +3.61%     
==========================================
  Files          15       11       -4     
  Lines        3403     2255    -1148     
==========================================
- Hits         1217      888     -329     
+ Misses       2186     1367     -819     
Flag Coverage Δ
unittests 39.37% <66.66%> (+3.61%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
tobac/utils.py 48.28% <50.00%> (ø)
tobac/feature_detection.py 80.52% <69.23%> (+0.76%) ⬆️
tobac/tracking.py 65.45% <0.00%> (-3.34%) ⬇️
tobac/centerofgravity.py 6.25% <0.00%> (-1.22%) ⬇️
tobac/analysis.py 7.91% <0.00%> (-0.60%) ⬇️
tobac/wrapper.py 6.77% <0.00%> (-0.16%) ⬇️
tobac/utils/mask.py
tobac/utils/internal.py
tobac/utils/general.py
tobac/utils/__init__.py
... and 2 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@JuliaKukulies JuliaKukulies left a comment

Choose a reason for hiding this comment

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

Great that you managed to get these changes over to the hotfix branch @w-k-jones! Looks all good to me and hopefully, it will be as easy to merge back into v1.5

@JuliaKukulies JuliaKukulies mentioned this pull request Feb 18, 2023
10 tasks
JuliaKukulies pushed a commit to JuliaKukulies/tobac that referenced this pull request Feb 21, 2023
JuliaKukulies pushed a commit to JuliaKukulies/tobac that referenced this pull request Feb 21, 2023
Copy link
Member

@freemansw1 freemansw1 left a comment

Choose a reason for hiding this comment

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

I'm happy for this to be merged. Sorry that I missed approving this.

@freemansw1 freemansw1 mentioned this pull request Feb 21, 2023
11 tasks
@w-k-jones
Copy link
Member Author

I'm happy for this to be merged. Sorry that I missed approving this.

No worries! I'll go merge now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Code that is failing or producing the wrong result
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants