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

Name refactoring for tests, growth, and median #503

Merged
merged 5 commits into from
Nov 2, 2023
Merged

Conversation

nathanvaughan-NOAA
Copy link
Contributor

What is the feature?

  • Refactoring test names to remove _ and match google style recommendations
  • Refactoring population to use weight_at_age[] vector instead of growth evaluate function
  • Refactoring to replace the median parameter with inflection_point to be more descriptive and avoid overlap with R function names

How have you implemented the solution?

We have refactored the code base to change names as described.

Does the PR impact any other area of the project?

No this should not impact the rest of the code

How to test this change

Developer pre-PR checklist

  • I relied on GitHub actions to 🧪 things for me while I sat on the 🛋️.

Co-authored-by: Matthew-Supernaw-NOAA <matthew.supernaw@noaa.gov>
Co-authored-by: Nathan Vaughan <nathanvaughan-NOAA@users.noreply.github.com>
Co-authored-by: Kelli Johnson <kelli.johnson@noaa.gov>

Do not change median_Ro
Co-authored-by: Matthew-Supernaw-NOAA <matthew.supernaw@noaa.gov>
Co-authored-by: Nathan Vaughan <nathanvaughan-NOAA@users.noreply.github.com>
Co-authored-by: Kelli Johnson <kelli.johnson@noaa.gov>
@nathanvaughan-NOAA
Copy link
Contributor Author

We know we are a couple of commits behind main but given the large number of open pull requests we were leaving another rebase until this is ready to be merged into main.

Copy link
Contributor

@Bai-Li-NOAA Bai-Li-NOAA left a comment

Choose a reason for hiding this comment

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

This looks great! Thanks for the name refactoring. I can help with merging these changes into the main branch once the conflicts are resolved.

Copy link

codecov bot commented Nov 2, 2023

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Files Coverage Δ
R/create_rcpp_interface_object.R 0.00% <ø> (ø)
inst/include/common/fims_math.hpp 100.00% <100.00%> (ø)
inst/include/interface/rcpp/rcpp_interface.hpp 71.06% <100.00%> (ø)
...population_dynamics/maturity/functors/logistic.hpp 100.00% <ø> (ø)
...lude/population_dynamics/population/population.hpp 100.00% <100.00%> (ø)
..._dynamics/selectivity/functors/double_logistic.hpp 100.00% <ø> (ø)
...ulation_dynamics/selectivity/functors/logistic.hpp 100.00% <ø> (ø)
...lude/interface/rcpp/rcpp_objects/rcpp_maturity.hpp 82.85% <50.00%> (ø)
...e/interface/rcpp/rcpp_objects/rcpp_selectivity.hpp 54.54% <38.88%> (ø)

... and 8 files with indirect coverage changes

📢 Thoughts on this report? Let us know!.

@nathanvaughan-NOAA
Copy link
Contributor Author

@ChristineStawitz-NOAA Looks like we already found a scenario where the merge block is an issue. This pull request says it cannot be rebased due to conflicts and it will now only let me choose Squash and merge which I don't want to do because these are 4 different issues that would be best kept separate for future interpretability.

@ChristineStawitz-NOAA
Copy link
Contributor

@nathanvaughan-NOAA I came to the same conclusion once I tried to approve :) I removed that setting

@nathanvaughan-NOAA
Copy link
Contributor Author

Hahaha sounds good, I'll merge once I fix these merge conflicts :)

@nathanvaughan-NOAA nathanvaughan-NOAA merged commit bb5c710 into main Nov 2, 2023
13 checks passed
@nathanvaughan-NOAA nathanvaughan-NOAA deleted the refactoring branch November 2, 2023 21:36
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.

4 participants