Skip to content

Commit

Permalink
reran roxygen2 after pull request
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:trinker/wakefield

Conflicts:
	DESCRIPTION
  • Loading branch information
trinker committed Oct 24, 2017
2 parents 8bb6285 + ce097c0 commit d72d9f3
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 21 deletions.
13 changes: 8 additions & 5 deletions DESCRIPTION
@@ -1,11 +1,14 @@
Package: wakefield
Title: Generate Random Data Sets
Version: 0.3.2
Authors@R: c( person("Tyler", "Rinker", email =
"tyler.rinker@gmail.com", role = c("aut", "cre")),
person("Josh", "O'Brien", role = "ctb"), person("Ananda",
"Mahto", role = "ctb"), person("Matthew", "Sigal", role =
"ctb"), person("Jonathan", "Carroll", role = "ctb") )
Authors@R: c(
person("Tyler", "Rinker", email = "tyler.rinker@gmail.com", role = c("aut", "cre")),
person("Josh", "O'Brien", role = "ctb"),
person("Ananda", "Mahto", role = "ctb"),
person("Matthew", "Sigal", role = "ctb"),
person("Jonathan", "Carroll", role = "ctb"),
person("Scott", "Westenberger", role = "ctb")
)
Maintainer: Tyler Rinker <tyler.rinker@gmail.com>
Description: Generates random data sets including: data.frames, lists,
and vectors.
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Expand Up @@ -35,7 +35,7 @@ wakefield 0.2.1
wakefield 0.2.0
----------------------------------------------------------------

IMPROVEMENTS
**IMPROVEMENTS**

* Added clarification to `groups` to indicate its binary grouping and alternate
grouping for &gt; 2 groups (see <a href="https://github.com/trinker/wakefield/issues/5">issue #5</a>).
Expand Down
13 changes: 8 additions & 5 deletions R/age.R
@@ -1,19 +1,22 @@
#' Generate Random Vector of Ages
#'
#' Generate a random vector of ages.
#' Generate a random vector of ages within the provided range. The default age
#' range is set between 18 and 89, to match the age ranges which appear (see e.g.,
#' https://gssdataexplorer.norc.org/variables/53/vshow).
#'
#' @inheritParams r_sample_factor
#' @return Returns a random factor vector of gender elements.
#' @return Returns a random integer vector of ages within the provided range
#' (defaults to 18:89).
#' @keywords age
#' @export
#' @include utils.R r_sample.R
#' @family variable functions
#' @examples
#' age(10)
#' hist(age(10000))
#' age(10) # draw 10 ages with default values
#' hist(age(n=10000))
#' interval(age, 3, n = 1000)
age <- hijack(r_sample,
name = "Age",
x = 20:35
x = 18:89
)

2 changes: 1 addition & 1 deletion R/level.R
Expand Up @@ -49,7 +49,7 @@ math <- hijack(r_sample,

#' Generate Random Vector of Levels
#'
#' \code{math} - Generate a random vector of integer English language arts (ELA)
#' \code{ela} - Generate a random vector of integer English language arts (ELA)
#' levels (1-4) similar to New York State grades 3-8 assessment results.
#'
#' @export
Expand Down
3 changes: 2 additions & 1 deletion R/name.R
@@ -1,6 +1,7 @@
#' Generate Random Vector of Names
#'
#' Generate a random vector of first names (Gender Neutral-ish).
#' Generate a random vector of first names. This dataset includes all unique entries
#' from the \code{babynames} package.
#'
#' @inheritParams r_sample_replace
#' @return Returns a random vector of name elements.
Expand Down
Binary file modified data/name_neutral.rda
Binary file not shown.
2 changes: 1 addition & 1 deletion inst/maintenance.R
@@ -1,7 +1,7 @@
#========
# BUILD
#========
source("inst/build.R")
update_date(); update_news(); source("inst/build.R")

#==========================
# Run unit tests
Expand Down
13 changes: 8 additions & 5 deletions man/age.Rd

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

2 changes: 1 addition & 1 deletion man/level.Rd

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

3 changes: 2 additions & 1 deletion man/name.Rd

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

0 comments on commit d72d9f3

Please sign in to comment.