tobac icon indicating copy to clipboard operation
tobac copied to clipboard

Resetting parameters and adding exceptions for adaptive search

Open snilsn opened this issue 3 years ago • 3 comments
trafficstars

This PR includes the bugfixes for #163 and #164. I also updated the doctrings for the parameters.

  • [x] Have you followed our guidelines in CONTRIBUTING.md?
  • [x] Have you self-reviewed your code and corrected any misspellings?
  • [x] Have you written documentation that is easy to understand?
  • [x] Have you written descriptive commit messages?
  • [x] Have you formatted your code using black?
  • [x] Have all tests passed in your local clone?
  • [x] Have you kept your pull request small and limited so that it is easy to review?
  • [x] Have the newest changes from this branch been merged?

Not needed:

  • [ ] Have you added NumPy docstrings for newly added functions?
  • [ ] If you have introduced a new functionality, have you added adequate unit tests?
  • [ ] If you have introduced a new functionality, have you added an example notebook?

snilsn avatar Jul 28 '22 09:07 snilsn

Codecov Report

Merging #168 (20c4035) into RC_v1.4.0 (54e21ae) will increase coverage by 1.85%. The diff coverage is 83.33%.

@@              Coverage Diff              @@
##           RC_v1.4.0     #168      +/-   ##
=============================================
+ Coverage      33.06%   34.91%   +1.85%     
=============================================
  Files             11       11              
  Lines           2090     2102      +12     
=============================================
+ Hits             691      734      +43     
+ Misses          1399     1368      -31     
Flag Coverage Δ
unittests 34.91% <83.33%> (+1.85%) :arrow_up:

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

Impacted Files Coverage Δ
tobac/tracking.py 64.48% <83.33%> (+3.43%) :arrow_up:
tobac/feature_detection.py 70.71% <0.00%> (+0.55%) :arrow_up:
tobac/testing.py 94.55% <0.00%> (+10.54%) :arrow_up:

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

codecov[bot] avatar Jul 28 '22 09:07 codecov[bot]

Thanks for your feedback @freemansw1 , I added the changed you requested. This definitely makes sense if someone is using trackpy and tobac at the same time.

snilsn avatar Aug 09 '22 08:08 snilsn

I have added a test for the saved parameters of trackpy as you suggested in the last meeting, @freemansw1

snilsn avatar Aug 23 '22 11:08 snilsn

Apologies; I had missed that you had updated this. @snilsn are you happy for me to merge?

It looks like there's a merge conflict from the changes that have been added in v1.3.3 (nothing severe as far as I can see); @snilsn are you happy to resolve the conflict, or do you want me to do so?

freemansw1 avatar Sep 09 '22 01:09 freemansw1

Resolved and ready to merge @freemansw1

snilsn avatar Sep 09 '22 12:09 snilsn