Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Imports:
magrittr,
pander,
pkgconfig,
reformulas,
rlang,
sandwich,
tibble
Expand Down
2 changes: 1 addition & 1 deletion R/colors.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#' @references
#'
#' Paul Tol's site is what is used to derive 4 of the 6 `jtools`-specific
#' qualitative palettes: \url{https://personal.sron.nl/~pault/}
#' qualitative palettes: \url{https://sronpersonalpages.nl/~pault/}
#'
#' Okabe and Ito's palette inspired "CUD Bright", though "CUD Bright" is not
#' exactly the same. "CUD" is the same.
Expand Down
2 changes: 1 addition & 1 deletion R/gscale.R
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
#'
#' Gelman, A. (2008). Scaling regression inputs by dividing by two standard
#' deviations. \emph{Statistics in Medicine}, \emph{27}, 2865–2873.
#' \url{http://www.stat.columbia.edu/~gelman/research/published/standardizing7.pdf}
#' \url{https://sites.stat.columbia.edu/gelman/research/published/standardizing7.pdf}
#'
#' Grotenhuis, M. te, Pelzer, B., Eisinga, R., Nieuwenhuis, R.,
#' Schmidt-Catran, A., & Konig, R. (2017). When size matters: Advantages of
Expand Down
4 changes: 2 additions & 2 deletions R/lme4_utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ noReForm <- function(re.form) {

reOnly <- function(f, response = FALSE) {
response <- if (response && length(f) == 3) { f[[2]] } else { NULL }
reformulate(paste0("(", vapply(lme4::findbars(f), safeDeparse,
reformulate(paste0("(", vapply(reformulas::findbars(f), safeDeparse,
""), ")"), response = response)
}

Expand Down Expand Up @@ -238,7 +238,7 @@ mkNewReTrms <- function(object, newdata, re.form = NULL, na.action = na.pass,
0) {
newdata <- newdata[-fit.na.action, ]
}
ReTrms <- lme4::mkReTrms(lme4::findbars(re.form[[2]]), rfd)
ReTrms <- reformulas::mkReTrms(reformulas::findbars(re.form[[2]]), rfd)
ReTrms <- within(ReTrms, Lambdat@x <- unname(lme4::getME(object,
"theta")[Lind]))
if (!allow.new.levels && any(vapply(ReTrms$flist, anyNA,
Expand Down
2 changes: 1 addition & 1 deletion R/mer_utils.r
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ get.random.formula <- function(model, rhs) {
random.formula <- if (any(class(model) %in% c("lmerMod", "lmerModLmerTest",
"glmerMod", "glmmTMB"))) {

paste("(", lme4::findbars(formula(model)), ")", collapse = " + ")
paste("(", reformulas::findbars(formula(model)), ")", collapse = " + ")

}

Expand Down
2 changes: 1 addition & 1 deletion man/gscale.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/jtools_colors.Rd

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

2 changes: 1 addition & 1 deletion vignettes/summ.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ you would get if you did `scale(log(us_gross))` rather than

You can also choose a different number of standard deviations to divide by for
standardization.
[Andrew Gelman](http://www.stat.columbia.edu/~gelman/research/published/standardizing7.pdf)
[Andrew Gelman](https://sites.stat.columbia.edu/gelman/research/published/standardizing7.pdf)
has been a proponent of dividing by 2 standard
deviations; if you want to do things that way, give the argument `n.sd = 2`.

Expand Down