From 1161ba503d7007bebadaa276bd60bf90c2af73c3 Mon Sep 17 00:00:00 2001 From: singmann Date: Thu, 25 May 2017 10:23:04 +0200 Subject: [PATCH] updated documentation, version bump --- DESCRIPTION | 39 +++++++++++++++++++-------------------- NEWS | 14 ++++++++++++++ R/afex-package.R | 13 ++++++++++--- dev.R | 2 +- man/afex-package.Rd | 13 ++++++++++--- 5 files changed, 54 insertions(+), 27 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 25453ef..4a7ab50 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,32 +3,31 @@ Type: Package Title: Analysis of Factorial Experiments Depends: R (>= 3.1.0), lme4 (>= 1.1-8), lsmeans (>= 2.17) Suggests: xtable, parallel, plyr, optimx, nloptr, knitr, rmarkdown, lattice, - latticeExtra, multcomp, testthat, mlmRev, dplyr, tidyr, dfoptim, Matrix + latticeExtra, multcomp, testthat, mlmRev, dplyr, tidyr, dfoptim, Matrix, psych Imports: stringr, coin, pbkrtest (>= 0.4-1), lmerTest, car, reshape2, stats, methods Description: Convenience functions for analyzing factorial experiments using ANOVA or - mixed models. aov_ez(), aov_car(), and aov_4() allow specification of - between, within (i.e., repeated-measures), or mixed between-within (i.e., - split-plot) ANOVAs for data in long format (i.e., one observation per row), - aggregating multiple observations per individual and cell of the design. - mixed() fits mixed models using lme4::lmer() and computes p-values for all - fixed effects using either Kenward-Roger or Satterthwaite approximation for - degrees of freedom (LMM only), parametric bootstrap (LMMs and GLMMs), or - likelihood ratio tests (LMMs and GLMMs). afex uses type 3 sums of squares - as default (imitating commercial statistical software). + mixed models. aov_ez(), aov_car(), and aov_4() allow specification of between, + within (i.e., repeated-measures), or mixed between-within (i.e., split-plot) + ANOVAs for data in long format (i.e., one observation per row), aggregating + multiple observations per individual and cell of the design. mixed() fits mixed + models using lme4::lmer() and computes p-values for all fixed effects using + either Kenward-Roger or Satterthwaite approximation for degrees of freedom (LMM + only), parametric bootstrap (LMMs and GLMMs), or likelihood ratio tests (LMMs + and GLMMs). afex uses type 3 sums of squares as default (imitating commercial + statistical software). URL: http://afex.singmann.science/, https://github.com/singmann/afex BugReports: https://github.com/singmann/afex/issues License: GPL (>=2) Encoding: UTF-8 VignetteBuilder: knitr Authors@R: c(person(given="Henrik", family="Singmann", role=c("aut", "cre"), - email="singmann+afex@gmail.com"), person(given="Ben", family="Bolker", - role=c("aut")), person(given="Jake", family="Westfall", role=c("aut")), - person(given="Frederik", family="Aust", role=c("aut")), - person(given="Søren", family="Højsgaard", role=c("ctb")), - person(given="John", family="Fox", role=c("ctb")), person(given="Michael - A.", family="Lawrence", role=c("ctb")), person(given="Ulf", - family="Mertens", role=c("ctb")), person(given="Jonathan", family="Love", - role=c("ctb")) ) -Version: 0.17-8 -Date: 2017-04-12 + email="singmann+afex@gmail.com"), person(given="Ben", family="Bolker", + role=c("aut")), person(given="Jake", family="Westfall", role=c("aut")), + person(given="Frederik", family="Aust", role=c("aut")), person(given="Søren", + family="Højsgaard", role=c("ctb")), person(given="John", family="Fox", + role=c("ctb")), person(given="Michael A.", family="Lawrence", role=c("ctb")), + person(given="Ulf", family="Mertens", role=c("ctb")), person(given="Jonathan", + family="Love", role=c("ctb")) ) +Version: 0.18-0 +Date: 2017-05-25 RoxygenNote: 6.0.1 diff --git a/NEWS b/NEWS index 8caef0b..a5f4c76 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,18 @@ ************************* + ** afex VERSION 0.18-x ** + ************************* + + Changes in afex Version 0.18-0 + Released May 2017 + + Bugfixes + + o aov_ez did not work with more than one covariate + (https://github.com/singmann/afex/issues/29). + + + + ************************* ** afex VERSION 0.17-x ** ************************* diff --git a/R/afex-package.R b/R/afex-package.R index 29d4d91..0eaf6a2 100644 --- a/R/afex-package.R +++ b/R/afex-package.R @@ -3,15 +3,22 @@ #' \tabular{ll}{ #' Package: \tab afex\cr #' Type: \tab Package\cr -#' Version: \tab 0.17-8\cr -#' Date: \tab 2017-04-12\cr +#' Version: \tab 0.18-0\cr +#' Date: \tab 2017-05-25\cr #' Depends: \tab R (>= 3.1.0), lme4 (>= 1.1-8), lsmeans (>= 2.17)\cr #' Encoding: \tab UTF-8\cr #' License: \tab GPL (>=2)\cr #' URL: \tab http://afex.singmann.science/, https://github.com/singmann/afex\cr #' } #' -#' Convenience functions for analyzing factorial experiments using ANOVA or mixed models. aov_ez(), aov_car(), and aov_4() allow specification of between, within (i.e., repeated-measures), or mixed between-within (i.e., split-plot) ANOVAs for data in long format (i.e., one observation per row), aggregating multiple observations per individual and cell of the design. mixed() fits mixed models using lme4::lmer() and computes p-values for all fixed effects using either Kenward-Roger or Satterthwaite approximation for degrees of freedom (LMM only), parametric bootstrap (LMMs and GLMMs), or likelihood ratio tests (LMMs and GLMMs). afex uses type 3 sums of squares as default (imitating commercial statistical software). +#' Convenience functions for analyzing factorial experiments using ANOVA or mixed models. +#' aov_ez(), aov_car(), and aov_4() allow specification of between, within (i.e., +#' repeated-measures), or mixed between-within (i.e., split-plot) ANOVAs for data in long format (i.e., +#' one observation per row), aggregating multiple observations per individual and cell of the +#' design. mixed() fits mixed models using lme4::lmer() and computes p-values for all fixed +#' effects using either Kenward-Roger or Satterthwaite approximation for degrees of freedom +#' (LMM only), parametric bootstrap (LMMs and GLMMs), or likelihood ratio tests (LMMs and +#' GLMMs). afex uses type 3 sums of squares as default (imitating commercial statistical software). #' #' @aliases afex-package #' @name afex-package diff --git a/dev.R b/dev.R index b23b5de..54075dd 100644 --- a/dev.R +++ b/dev.R @@ -37,7 +37,7 @@ R.libs <- "./packages/library" closeAllConnections() roxy.package( pck.source.dir = pkg.src.dir, - pck.version = "0.17-8", + pck.version = "0.18-0", pck.description = data.frame( Package = "afex", Type = "Package", diff --git a/man/afex-package.Rd b/man/afex-package.Rd index 589b5cc..08b9067 100644 --- a/man/afex-package.Rd +++ b/man/afex-package.Rd @@ -11,15 +11,22 @@ Analysis of Factorial Experiments. \tabular{ll}{ Package: \tab afex\cr Type: \tab Package\cr -Version: \tab 0.17-8\cr -Date: \tab 2017-04-12\cr +Version: \tab 0.18-0\cr +Date: \tab 2017-05-25\cr Depends: \tab R (>= 3.1.0), lme4 (>= 1.1-8), lsmeans (>= 2.17)\cr Encoding: \tab UTF-8\cr License: \tab GPL (>=2)\cr URL: \tab http://afex.singmann.science/, https://github.com/singmann/afex\cr } -Convenience functions for analyzing factorial experiments using ANOVA or mixed models. aov_ez(), aov_car(), and aov_4() allow specification of between, within (i.e., repeated-measures), or mixed between-within (i.e., split-plot) ANOVAs for data in long format (i.e., one observation per row), aggregating multiple observations per individual and cell of the design. mixed() fits mixed models using lme4::lmer() and computes p-values for all fixed effects using either Kenward-Roger or Satterthwaite approximation for degrees of freedom (LMM only), parametric bootstrap (LMMs and GLMMs), or likelihood ratio tests (LMMs and GLMMs). afex uses type 3 sums of squares as default (imitating commercial statistical software). +Convenience functions for analyzing factorial experiments using ANOVA or mixed models. +aov_ez(), aov_car(), and aov_4() allow specification of between, within (i.e., +repeated-measures), or mixed between-within (i.e., split-plot) ANOVAs for data in long format (i.e., +one observation per row), aggregating multiple observations per individual and cell of the +design. mixed() fits mixed models using lme4::lmer() and computes p-values for all fixed +effects using either Kenward-Roger or Satterthwaite approximation for degrees of freedom +(LMM only), parametric bootstrap (LMMs and GLMMs), or likelihood ratio tests (LMMs and +GLMMs). afex uses type 3 sums of squares as default (imitating commercial statistical software). } \author{ Henrik Singmann, Ben Bolker, Jake Westfall, Frederik Aust, with contributions from Søren Højsgaard, John Fox, Michael A. Lawrence, Ulf Mertens, Jonathan Love