Skip to content

Commit

Permalink
Merge pull request #106 from carriedaymont/upd-v2
Browse files Browse the repository at this point in the history
Add v2.0.3 changes
  • Loading branch information
delosh653 authored Nov 3, 2022
2 parents 5150c9d + cf71b00 commit 4cb0818
Show file tree
Hide file tree
Showing 55 changed files with 1,867 additions and 2,163 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Package: growthcleanr
Type: Package
Title: Data Cleaner for Anthropometric Measurements
Version: 2.0.2
Version: 2.0.3
Authors@R: c(
person("Daymont","Carrie", email = "[email protected]", role = "aut"),
person("Daymont","Carrie", email = "[email protected]", role = c("ctb","cre")),
person("Grundmeier","Robert", role = "aut"),
person("Miller","Jeffrey", role = "aut"),
person("Campos","Diego", role = "aut"),
person("Chudnov","Dan", role = "ctb"),
person("De los Santos","Hannah", email = "[email protected]", role = c("ctb","cre")),
person("De los Santos","Hannah", email = "[email protected]", role = c("ctb")),
person("Cao","Lusha", role = "ctb"),
person("Silva","Steffani", role = "ctb"),
person("Zhang","Hanzhe", role = "ctb"),
Expand Down
11 changes: 11 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# growthcleanr 2.0.3 - 2022-11-01

## Added

- CRAN release checklist now added under Developer Guidelines vignette (#99)

## Changed

- All possible levels for `cleangrowth()` output factor now enumerated
- Updated maintainer to Carrie Daymont

# growthcleanr 2.0.2 - 2022-09-13

## Added
Expand Down
28 changes: 25 additions & 3 deletions R/growth.R
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ cleangrowth <- function(subjid,

# constants for pediatric
# enumerate the different exclusion levels
exclude.levels <- c(
exclude.levels.peds <- c(
'Include',
'Unit-Error-High',
'Unit-Error-Low',
Expand Down Expand Up @@ -235,6 +235,29 @@ cleangrowth <- function(subjid,
'Exclude-Too-Many-Errors-Other-Parameter'
)

exclude.levels.adult <- c(
"Include",
"Exclude-Adult-BIV",
"Exclude-Adult-Hundreds",
"Exclude-Adult-Unit-Errors",
"Exclude-Adult-Transpositions",
"Exclude-Adult-Weight-Cap-Identical",
"Exclude-Adult-Weight-Cap",
"Exclude-Adult-Swapped-Measurements",
"Exclude-Adult-Identical-Same-Day",
"Exclude-Adult-Extraneous-Same-Day",
"Exclude-Adult-Distinct-Pairs",
"Exclude-Adult-Distinct-3-Or-More",
"Exclude-Adult-EWMA-Extreme",
"Exclude-Adult-Distinct-Ordered-Pairs",
"Exclude-Adult-EWMA-Moderate",
"Exclude-Adult-Possibly-Impacted-By-Weight-Cap",
"Exclude-Adult-Distinct-Single",
"Exclude-Adult-Too-Many-Errors"
)

exclude.levels <- base::union(exclude.levels.peds, exclude.levels.adult)

# if there's no pediatric data, no need to go through this rigamarole
if (nrow(data.all) > 0){

Expand Down Expand Up @@ -665,8 +688,7 @@ cleangrowth <- function(subjid,
exclude = c(as.character(ret.df$exclude), res$result),
mean_sde = c(rep(NA, nrow(ret.df)), res$mean_sde)
)
full_out[, exclude := factor(exclude, levels = unique(c(exclude.levels,
unique(exclude))))]
full_out[, exclude := factor(exclude, levels = exclude.levels)]
full_out <- full_out[order(line),]
# remove column added for keeping track
full_out[, line := NULL]
Expand Down
1 change: 1 addition & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ The rest of this documentation includes:
notes and suggestions for running `growthcleanr` with large data sources
- [Next steps](https://carriedaymont.github.io/growthcleanr/articles/next-steps.html),
notes on potential enhancements to the pediatric and adult algorithms
- [Developer guidelines](https://carriedaymont.github.io/growthcleanr/articles/developer-guidelines.html), advice for contributors to this package, including a CRAN release checklist

## Changes

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ The rest of this documentation includes:
- [Next
steps](https://carriedaymont.github.io/growthcleanr/articles/next-steps.html),
notes on potential enhancements to the pediatric and adult algorithms
- [Developer
guidelines](https://carriedaymont.github.io/growthcleanr/articles/developer-guidelines.html),
advice for contributors to this package, including a CRAN release
checklist

## Changes

Expand Down
1 change: 1 addition & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ articles:
- utilities
- large-data-sets
- next-steps
- developer-guidelines

reference:
- title: "Cleaning height and weight observations"
Expand Down
12 changes: 11 additions & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
# CRAN submission growthcleanr 2.0.2 (1)
# CRAN submission growthcleanr 2.0.3

## R CMD check results
There were no ERRORs, WARNINGs, or NOTEs.

## Downstream dependencies
There are currently no downstream dependencies for this package.



# Previous Submissions

# CRAN submission growthcleanr 2.0.2 (1)

## R CMD check results
There were no ERRORs, WARNINGs, or NOTEs.

## Downstream dependencies
There are currently no downstream dependencies for this package.

# CRAN submission growthcleanr 2.0.1 (6)

## R CMD check results
Expand Down
7 changes: 5 additions & 2 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 7 additions & 23 deletions docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions docs/articles/adult-algorithm.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4cb0818

Please sign in to comment.