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

Update preliminary infants algorithm to main #137

Merged
merged 107 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
0168aee
Change cutoffs for infants on extreme errors step
delosh653 Nov 2, 2022
de021d2
Adjust cutoffs for SD as well
delosh653 Nov 3, 2022
3fef550
Add initial changes for extreme errors to ewma step
delosh653 Nov 3, 2022
82a3888
Fix typos and row errors
delosh653 Nov 3, 2022
169a003
Restart -- move infants algorithm to new function temporarily
delosh653 Dec 8, 2022
425982c
Add cdc/who sd smoothing
delosh653 Dec 15, 2022
c4cd348
Add temporary extraneous for infants
delosh653 Dec 15, 2022
f94f1a9
Add carried forwards (and fix typos)
delosh653 Dec 15, 2022
efeda62
Add BIVs
delosh653 Dec 15, 2022
24a5d25
Add headcm as a valid parameter, filter out parameters not included (…
delosh653 Jan 5, 2023
27c5816
Begin updating recentering
delosh653 Jan 11, 2023
bb59ed7
Update recentering file (mis-compressed)
delosh653 Feb 2, 2023
0e94cc7
Fix problem with "pipe" operator and remove recentering from wrong se…
delosh653 Feb 2, 2023
90626a4
Fix smoothing subsetting
delosh653 Feb 2, 2023
09a628f
Update recentering for infants
delosh653 Feb 2, 2023
27cae74
Update recentering file
delosh653 Feb 6, 2023
b6bb33b
Integrate infants as separate option
delosh653 Feb 9, 2023
4c6cb21
Update cdc/who bridge to 2/4
delosh653 Feb 9, 2023
f4fc76d
Update exclude code
delosh653 Feb 9, 2023
5595d51
Add evil twins step to infant algorithm
delosh653 Feb 10, 2023
342bdaf
Add preliminary extreme ewma
delosh653 Feb 10, 2023
7eae5f2
Update infants extreme ewma
delosh653 Feb 16, 2023
648a3e3
Start including SDEs
delosh653 Feb 16, 2023
b46eede
Update height velocity files
delosh653 Mar 8, 2023
79a4545
Add updated reference files for WHO/CDC
delosh653 Mar 9, 2023
614acd0
Remove reference format file
delosh653 Mar 9, 2023
6d6cd71
Merge pull request #118 from carriedaymont/main
delosh653 Mar 9, 2023
6f05a4f
Update nonmatching param to be missing, not filtered out
delosh653 Mar 9, 2023
aa12fb9
Update documentation and add no found bindings
delosh653 Mar 9, 2023
8559091
Merge changes from main
delosh653 Mar 9, 2023
50923b3
Update news for infants release
delosh653 Mar 13, 2023
529dcf0
Update package site
delosh653 Mar 13, 2023
fa3c353
Update news and site for correct naming
delosh653 Mar 13, 2023
7bbc355
Merge pull request #42 from carriedaymont/upd-v3
delosh653 Mar 13, 2023
1dce9b5
Fix bug related to ambiguity in z scores
delosh653 Jun 9, 2023
98794b1
Add initial work for corrected z scores
delosh653 Jun 9, 2023
b9281a0
Merge branch 'infants-changes' of github.com:mitre/growthcleanr into …
delosh653 Jun 12, 2023
aae7638
Add fenton data
delosh653 Jun 19, 2023
de6b4c9
Add correcting z scores
delosh653 Jun 23, 2023
ef8432d
Add "no need to ewma" step
delosh653 Jun 26, 2023
760ed2f
Adjust nnte for all parameters
delosh653 Jun 26, 2023
9fe99b3
Update nnte to keep the "full" set as well
delosh653 Jun 26, 2023
cc64fc1
Update temporary extraneous for nntes
delosh653 Jun 27, 2023
142b009
Update carried forwards step
delosh653 Jun 28, 2023
1156db5
Fix clarification for HC on corrected z scores
delosh653 Jul 12, 2023
2a01233
Fix returning carried forward output
delosh653 Jul 12, 2023
1209d03
Update BIVs
delosh653 Jul 12, 2023
476c903
Fix the agedays and update the standardized BIV output
delosh653 Jul 12, 2023
fefed79
Update BIv to not consider NNTEs
delosh653 Jul 12, 2023
bb68e48
Add the first draft of evil twins
delosh653 Jul 12, 2023
45c5b0a
Add corrected tbc sd
delosh653 Jul 23, 2023
1dc5fd8
Update to fix corrected for ewma
delosh653 Jul 23, 2023
d366b93
Finish extreme EWMA
delosh653 Jul 23, 2023
5de245d
Add SDE step
delosh653 Jul 24, 2023
87f1942
Add first draft of moderate ewma
delosh653 Jul 26, 2023
b53ce8a
Fix bugs for step 15 (ewma all)
delosh653 Jul 31, 2023
ffcbd6d
Add step 16: birth height/hc ewma
delosh653 Aug 1, 2023
818fe19
Add supporting data for step 17
delosh653 Aug 1, 2023
878147b
Add step 17
delosh653 Aug 1, 2023
86963c3
Add step 19 (singles and pairs)
delosh653 Aug 1, 2023
05e0afd
Finish error load step
delosh653 Aug 1, 2023
afddde0
Clean up, add factor levels, and fix tiny SDe bug
delosh653 Aug 1, 2023
b2fb4a7
Remove ewma exp argument
delosh653 Aug 2, 2023
56e127d
Fix some bugs with CF and parallel/infants
delosh653 Aug 2, 2023
97ecc46
Pass in reference data path
delosh653 Aug 3, 2023
6c4164c
Remove quietly reference in supporting functions
delosh653 Aug 3, 2023
623df09
Add preallocation for mindiff
delosh653 Aug 9, 2023
8dbde80
Fix maxdiff preallocation
delosh653 Aug 10, 2023
1d4082e
Fix ewma calculations for temp same day in ewma extreme
delosh653 Aug 14, 2023
eaa38ff
Remove edge calculations for HC in step 17
delosh653 Aug 14, 2023
bb6129d
Fix cutoff in pairs step
delosh653 Aug 14, 2023
3c4d7bb
Do not overwrite error load code
delosh653 Aug 14, 2023
0b1445c
Move the preallocation into the subset
delosh653 Aug 14, 2023
059c9da
Fixed missing temporary extraneous to includes
delosh653 Aug 14, 2023
8aea728
Update recentering file
delosh653 Aug 17, 2023
20e2366
Add "not cleaned" for HC > 3 yo
delosh653 Aug 17, 2023
62274d9
Fix some criteria for NNTE
delosh653 Aug 18, 2023
a62bb0e
Update raw differences step based on updates
delosh653 Aug 18, 2023
0522454
Add absolute for 1/2 measures step
delosh653 Aug 18, 2023
62bc3cd
Fix typo for BIVs
delosh653 Aug 21, 2023
cd848e8
Fix WHO merging in step 17
delosh653 Aug 22, 2023
9747e2b
Rename Evil Twins
delosh653 Aug 22, 2023
dd5219f
Update overwriting for Evil Twins
delosh653 Aug 22, 2023
8f8df59
Fix smoothing overwriting WHO scores
delosh653 Aug 22, 2023
226ebf5
Fix ewma testing for including 3 rows
delosh653 Aug 22, 2023
694ab8c
Fix EWMA exclusion codes
delosh653 Aug 22, 2023
095d5be
Adjust OOB measurements to include 2
delosh653 Aug 22, 2023
11a4a37
Overwrite exclusion for 0 -- should now be BIV
delosh653 Aug 22, 2023
527d5ee
Add some more wrapping for infants extension
delosh653 Aug 22, 2023
783cbc2
Remove printing
delosh653 Aug 22, 2023
c8b5cce
Make sure that pediatric and infant algorithms go through different t…
delosh653 Sep 8, 2023
16f9dc5
Update "no visible bindings"
delosh653 Sep 8, 2023
374aeec
Clean up trues, update infants naming
delosh653 Sep 13, 2023
d7511a8
Update documentation
delosh653 Sep 13, 2023
63ff1f2
Update tests for infants, fix dplyr issue
delosh653 Sep 13, 2023
96b6abc
Update with prelim release information
delosh653 Sep 13, 2023
10fb5ed
Fix warning for using ..
delosh653 Sep 13, 2023
a1b95e2
Add vignette for prelim infants
delosh653 Sep 13, 2023
fba0a0b
Merge branch 'main' of github.com:mitre/growthcleanr into infants-cha…
delosh653 Sep 13, 2023
784908b
Remove old recentering file
delosh653 Sep 13, 2023
1375129
Update CRAN comments
delosh653 Sep 13, 2023
23c71c8
Update gitignore to add infants document pdf
delosh653 Sep 13, 2023
7e99356
Update pkgdown site
delosh653 Sep 13, 2023
ebe274f
Update documentation for extdata infants
delosh653 Sep 13, 2023
ca86bca
Merge pull request #105 from mitre/infants-changes
delosh653 Sep 13, 2023
0719bb5
Update package down site
delosh653 Sep 13, 2023
6cb6fa9
Merge pull request #138 from carriedaymont/upd-site
dchud Sep 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

# produced vignettes
vignettes/*.html
vignettes/*.pdf

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: growthcleanr
Type: Package
Title: Data Cleaner for Anthropometric Measurements
Version: 2.1.1
Version: 2.2.0
Authors@R: c(
person("Carrie", "Daymont", email = "[email protected]", role = c("ctb","cre")),
person("Robert", "Grundmeier", role = "aut"),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import(parallel)
import(plyr, except = c(failwith, id, summarize, count, desc, mutate, arrange, rename, is.discrete, summarise, summarize))
import(tidyr, except = extract)
importFrom(stats,approx)
importFrom(stats,embed)
importFrom(stats,median)
importFrom(stats,pnorm)
importFrom(stats,qnorm)
Expand Down
14 changes: 14 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# growthcleanr 2.2.0-prelim-infants - 2023-09-13

## Added

- Added option to cleangrowth for the preliminary infants algorithm -- expands pediatric algorithm to consider 0 - 2 years old, with infants = TRUE in cleangrowth(), with all steps implemented. Note that this option is still preliminary and should not be used for research. For more information regarding the logic of the algorithm, see the vignette 'Preliminary Infants Algorithm.'


# growthcleanr 3.0.0-infants-beta - 2023-03-13

## Added

- Added the infants beta release algorithm -- expands pediatric algorithm to consider 0 - 2 years old, with infants = TRUE in cleangrowth()
- Updated velocity data for the extension (#122)

# growthcleanr 2.1.1 - 2023-03-01

## Changed
Expand Down
120 changes: 120 additions & 0 deletions R/extdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@ NULL
#'
NULL

#' CDC Growth Percentile Table for Infants
#'
#' Part of default CDC-derived tables
#'
#' Contains percentiles for various ages, gender, and weights, pre-calculated by CDC for infants algorithm
#'
#' @name growth_cdc_ext_infants
#'
#' @section growthfile_cdc_ext_infants.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' WHO Growth Percentile Table
#'
#' Part of default WHO-derived tables
#'
#' Contains percentiles for various ages, gender, and weights, pre-calculated by WHO
#'
#' @name growth_who_ext
#'
#' @section growthfile_who.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' Length to Age Table
#'
#' Part of default CDC-derived tables
Expand All @@ -43,6 +73,20 @@ NULL
#'
NULL

#' Infants reference medians
#'
#' Contains reference median values for default recentering in the infants
#' algorithm
#'
#' @name rc-reference-medians
#'
#' @section rcfile-2023-08-15_format.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' NHANES reference medians
#'
#' Contains reference median values for default recentering, derived from NHANES
Expand Down Expand Up @@ -72,6 +116,22 @@ NULL
#'
NULL

#' Tanner Growth Velocity Table for Infants
#'
#' Part of default CDC-derived tables
#'
#' Contains velocities for growth pre-calculated by CDC, used for the infants
#' algorithm
#'
#' @name tanner_ht_vel_rev
#'
#' @section tanner_ht_vel_rev.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' Tanner Growth Velocity Table with (2\eqn{\sigma})
#'
#' Part of default CDC-derived tables
Expand Down Expand Up @@ -167,6 +227,38 @@ NULL
#'
NULL

#' WHO Maximum Head Circumference Velocity for (3\eqn{\sigma})
#'
#' Part of default WHO-derived tables
#'
#' Contains three standard deviations for the World Health Organization values of
#' maximum head circumference velocities.
#'
#' @name who_hc_maxvel
#'
#' @section who_hc_maxvel_3sd_infants.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' WHO Head Circumference Velocity for (3\eqn{\sigma})
#'
#' Part of default WHO-derived tables
#'
#' Contains three standard deviations for the World Health Organization values of
#' head circumference velocities.
#'
#' @name who_hc_vel_3sd
#'
#' @section who_hc_vel_3sd_infants.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' CDC SAS BMI Input
#'
#' Contains input data for CDC SAS macro for calculating BMI values.
Expand Down Expand Up @@ -205,3 +297,31 @@ NULL
#'
#'
NULL

#' Fenton Growth Curves
#'
#' Fenton growth curves with premature infant data with sex, age, and integer
#' weight
#'
#' @name fentlms_foraga
#'
#' @section fentlms_foraga.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL

#' Fenton Growth Curve Z-Scores
#'
#' Fenton growth curves with premature infant z-scores for height and head
#'circumference
#'
#' @name fentlms_forz
#'
#' @section fentlms_forz.csv.gz:
#'
#' Used in function `cleangrowth()`
#'
#'
NULL
Loading