Skip to content

Commit

Permalink
prepare minor CRAN submission
Browse files Browse the repository at this point in the history
  • Loading branch information
singmann committed Sep 1, 2024
1 parent f3f6997 commit ee9153a
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ Authors@R: c(person(given="Henrik", family="Singmann", role=c("aut", "cre"),
person(given="Russell", family="Lenth", role=c("ctb")),
person(given="Rune", family="Haubo Bojesen Christensen", role=c("ctb")))
Version: 1.4-1
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
LazyData: true
11 changes: 6 additions & 5 deletions R/mixed.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#' tests, taken from \code{\link{afex_options}}.
#' @param method character vector indicating which methods for obtaining
#' p-values should be used: \code{"S"} corresponds to the Satterthwaite
#' approximation for degrees of freedom (via \code{\link{lmerTest}}, only
#' LMMs), \code{"KR"} corresponds to the Kenward-Roger approximation for
#' approximation for degrees of freedom (via \code{\link[lmerTest]{lmerTest}},
#' only LMMs), \code{"KR"} corresponds to the Kenward-Roger approximation for
#' degrees of freedom (only LMMs), \code{"PB"} calculates p-values based on
#' parametric bootstrap, \code{"LRT"} calculates p-values via the likelihood
#' ratio tests implemented in the \code{anova} method for \code{merMod}
Expand Down Expand Up @@ -102,8 +102,9 @@
#' the \code{+}, \code{sig_symbols = rep("", 4)} will display no symbols. The
#' default is given by \code{afex_options("sig_symbols")}.
#' @param ... further arguments (such as \code{weights}, \code{family}, or
#' \code{control}) passed to \code{\link{lmer}}/\code{\link{glmer}}. Note that
#' additional data (e.g., \code{weights}) need to be passed fully and not only
#' \code{control}) passed to
#' \code{\link[lme4]{lmer}}/\code{\link[lme4]{glmer}}. Note that additional
#' data (e.g., \code{weights}) need to be passed fully and not only
#' by name (e.g., \code{weights = df$weights} and not \code{weights =
#' weights}).
#'
Expand Down Expand Up @@ -190,7 +191,7 @@
#' of \code{anova.merMod}) which produces the known LRT tables.
#'
#' The \code{summary} method for objects of class \code{mixed} simply calls
#' \code{\link{summary.merMod}} on the full model.
#' \code{\link[lme4]{summary.merMod}} on the full model.
#'
#' If \code{return = "merMod"} (or when invoking \code{lmer_alt}), an object of
#' class \code{"lmerModLmerTest"} or of class \code{"merMod"} (depending on the
Expand Down
3 changes: 2 additions & 1 deletion dev.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ options(error = NULL)
devtools::test()
## before building, consider recreating the glmmTMB object for the vignette
devtools::build(args = "--compact-vignettes=both",
manual = TRUE,
path = "development/") # R CMD build afex --compact-vignettes="gs+qpdf"
document()
check()
check_built(path = "development/afex_1.3-1.tar.gz")
check_built(path = "development/afex_1.4-1.tar.gz")

## works better on windows:
devtools::test(filter = "plot", invert = TRUE)
Expand Down
Binary file modified development/afex_1.4-1.tar.gz
Binary file not shown.
11 changes: 6 additions & 5 deletions man/mixed.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/afex_analysing_accuracy_data.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Henrik Singmann"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{Analysis of Accuracy Data using ANOVA and binomial GLMMs}
Expand Down
2 changes: 1 addition & 1 deletion vignettes/afex_anova_example.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Henrik Singmann"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{ANOVA and Post-Hoc Contrasts: Reanalysis of Singmann and Klauer (2011)}
Expand Down
2 changes: 1 addition & 1 deletion vignettes/afex_mixed_example.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Henrik Singmann"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{Mixed Model Example Analysis: Reanalysis of Freeman et al. (2010)}
Expand Down
2 changes: 1 addition & 1 deletion vignettes/afex_plot_introduction.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Henrik Singmann"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{afex_plot: Publication Ready Plots for Experimental Designs}
Expand Down
2 changes: 1 addition & 1 deletion vignettes/afex_plot_supported_models.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Henrik Singmann"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{afex_plot: Supported Models}
Expand Down
2 changes: 1 addition & 1 deletion vignettes/assumptions_of_ANOVAs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: "Mattan S. Ben-Shachar"
date: "`r Sys.Date()`"
show_toc: true
output:
knitr:::html_vignette:
rmarkdown:::html_vignette:
toc: yes
vignette: >
%\VignetteIndexEntry{Testing the Assumptions of ANOVAs}
Expand Down

0 comments on commit ee9153a

Please sign in to comment.