diff --git a/DESCRIPTION b/DESCRIPTION index 0f913ff8..318ee5d8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: adoptr Type: Package Title: Adaptive Optimal Two-Stage Designs in R -Version: 0.2.0.9000 +Version: 0.2.0 Authors@R: c( person("Kevin", "Kunzmann", role = c("aut", "cre"), email = "kevin.kunzmann@mrc-bsu.cam.ac.uk"), person("Maximilian", "Pilz", role = c("aut"), email = "pilz@imbi.uni-heidelberg.de") diff --git a/NEWS.md b/NEWS.md index 457dd48d..990707f1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,11 +1,14 @@ # adoptr 0.2.0 * new feature: composite scores allows more generic expressions than just - affine score combinations + affine score combinations, cf. composite() +* affine scores (s1 + 2*s2) are no longer supported, use composite instead * more consistent class system: conditional scores no longer need a specification of distributions by default (no need for conditional sampel size e.g.). Instead, expected() now requires explicit specification of the data and prior distribution to integrate with. +* Vignettes updated +* fixed broked tests due to updated rpact diff --git a/R/CompositeScore.R b/R/CompositeScore.R index a0d34693..c4cc8198 100644 --- a/R/CompositeScore.R +++ b/R/CompositeScore.R @@ -29,7 +29,7 @@ setClass("CompositeConditionalScore", #' @template dotdotdot #' #' @return an object of class \code{CompositeConditionalScore} or -#' \code{CompositeUnconditionalScore} depending of the class of the scores used +#' \code{CompositeUnconditionalScore} depending on the class of the scores used #' in \code{expr} #' #' @seealso \link{Scores} @@ -41,7 +41,7 @@ setClass("CompositeConditionalScore", #' # linear combination: #' composite({ess - 50*power}) #' -#' # control flow +#' # control flow (e.g. for and while loops) #' composite({ #' res <- 0 #' for (i in 1:3) { diff --git a/R/adoptr.R b/R/adoptr.R index 285cc757..02952e12 100644 --- a/R/adoptr.R +++ b/R/adoptr.R @@ -1,9 +1,9 @@ #' Adaptive Optimal Two-Stage Designs #' #' The \pkg{adoptr} package provides functionality to explore custom optimal -#' two-stage designs for one or two-arm superiority tests. +#' two-stage designs for one- or two-arm superiority tests. #' Currently, only (asymptotically) normal test statistics are supported. -#' \pkg{adoptr} is makes heavy use of the S4 class system. +#' \pkg{adoptr} makes heavy use of the S4 class system. #' A good place to start learning about it can be found #' \href{http://adv-r.had.co.nz/OO-essentials.html}{here}. #' diff --git a/man/adoptr.Rd b/man/adoptr.Rd index 32f20e16..4362f5d9 100644 --- a/man/adoptr.Rd +++ b/man/adoptr.Rd @@ -7,9 +7,9 @@ \title{Adaptive Optimal Two-Stage Designs} \description{ The \pkg{adoptr} package provides functionality to explore custom optimal -two-stage designs for one or two-arm superiority tests. +two-stage designs for one- or two-arm superiority tests. Currently, only (asymptotically) normal test statistics are supported. -\pkg{adoptr} is makes heavy use of the S4 class system. +\pkg{adoptr} makes heavy use of the S4 class system. A good place to start learning about it can be found \href{http://adv-r.had.co.nz/OO-essentials.html}{here}. } diff --git a/man/composite.Rd b/man/composite.Rd index 72e05704..a80c25f2 100644 --- a/man/composite.Rd +++ b/man/composite.Rd @@ -23,7 +23,7 @@ or unconditional. Currently, no non-score variables are supported} } \value{ an object of class \code{CompositeConditionalScore} or - \code{CompositeUnconditionalScore} depending of the class of the scores used + \code{CompositeUnconditionalScore} depending on the class of the scores used in \code{expr} } \description{ @@ -37,7 +37,7 @@ power <- Power(Normal(), PointMassPrior(.4, 1)) # linear combination: composite({ess - 50*power}) -# control flow +# control flow (e.g. for and while loops) composite({ res <- 0 for (i in 1:3) { diff --git a/vignettes/defining-new-scores.Rmd b/vignettes/defining-new-scores.Rmd index 7e3abec0..53907d4f 100644 --- a/vignettes/defining-new-scores.Rmd +++ b/vignettes/defining-new-scores.Rmd @@ -2,7 +2,7 @@ title: "Defining New Scores" output: rmarkdown::html_vignette vignette: > - %\VignetteIndexEntry{SDefining New Scores} + %\VignetteIndexEntry{Defining New Scores} %\VignetteEngine{knitr::rmarkdown} %\VignetteEncoding{UTF-8} ---