Fixes for makeLifeTable, dEntropy, and kEntropy #18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…pdates pushed to Rcompadre-master)
…, and moves duplicated sections calculating lx and mx into separate functions as per #15
…n mid-point approx; remove ages at/beyond which lx is 0; standardize formatting and documentation
…o separate fn; stop converting lxmx == 0 to 1; standardize formatting and documentation
…idRule fn, and other small edits to documentation
|
@jonesor @robcito why haven't these changes been merged yet? |
|
I forgot about these. I had been meaning to ask @jonesor: who would be the best person to review these edits (Owen and Rob are both listed as authors on most of the relevant functions)? Or should I just merge these into the devel branch, and then we can have the 'review' process before merging devel with master? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes bugs in
makeLifeTable,dEntropy, andkEntropydescribed in #14.Pulls duplicated code sections calculating lx and mx into separate, exported functions (
ageSpecificSurvandageSpecificRepro), which now get called bymakeLifeTable,dEntropy, andkEntropy, as per #15.Edits toward standardizing error checking and documentation in
makeLifeTable,dEntropy, andkEntropy.