diff --git a/DESCRIPTION b/DESCRIPTION index 72fb736..8be8f9e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: graphicalMCP Title: Graphical Multiple Comparison Procedures -Version: 0.2.4 +Version: 0.2.5 Authors@R: c( person("Dong", "Xi", , "dong.xi1@gilead.com", role = c("aut", "cre")), person("Ethan", "Brockmann", , "ethan.brockmann@atorusresearch.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index c724408..8d30aee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -36,3 +36,8 @@ * Updated documentation according to issue #84 * Resubmission for first CRAN release + +# graphicalMCP 0.2.5 + +* Updated adjust_weights_parametric_util.Rd +* Resubmission for first CRAN release diff --git a/R/adjust_weights_parametric_util.R b/R/adjust_weights_parametric_util.R index a67c3f3..7436ca2 100644 --- a/R/adjust_weights_parametric_util.R +++ b/R/adjust_weights_parametric_util.R @@ -16,18 +16,12 @@ #' hypothesis testing problems. Note when parametric tests are used, only #' one-sided tests are supported. #' @param hypotheses A numeric vector of hypothesis weights. Must be a vector of -#' values between 0 & 1 (inclusive). The length should match the length of -#' `p`. The sum of hypothesis weights should not exceed 1. -#' @param p (Optional) A numeric vector of p-values (unadjusted, raw), whose -#' values should be between 0 & 1. The length should match the length of -#' `hypotheses`. +#' values between 0 & 1 (inclusive). The sum of hypothesis weights should not +#' exceed 1. #' @param test_corr (Optional) A numeric matrix of correlations between test #' statistics, which is needed to perform parametric tests using #' [adjust_weights_parametric()]. The number of rows and columns of #' this correlation matrix should match the length of `p`. -#' @param test_groups (Optional) A list of numeric vectors specifying hypotheses -#' to test together. Grouping is needed to correctly perform Simes and -#' parametric tests. #' @param maxpts (Optional) An integer scalar for the maximum number of function #' values, which is needed to perform parametric tests using the #' `mvtnorm::GenzBretz` algorithm. The default is 25000. diff --git a/codemeta.json b/codemeta.json index 95f0498..a4d5f3d 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,7 +7,7 @@ "codeRepository": "https://github.com/Gilead-BioStats/graphicalMCP", "issueTracker": "https://github.com/Gilead-BioStats/graphicalMCP/issues", "license": "Apache License 2", - "version": "0.2.4", + "version": "0.2.5", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -312,7 +312,7 @@ }, "SystemRequirements": null }, - "fileSize": "719.081KB", + "fileSize": "718.407KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/cran-comments.md b/cran-comments.md index f76a6cb..fa153ae 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,14 @@ +# Version 0.2.5 + +- This is the fifth submission to CRAN. + + Updated adjust_weights_parametric_util.Rd + + There is one note regarding the spelling of "al", "et", "Bretz", "MCPs" and + "familywise". This is to confirm that they are correct. + +## R CMD check results + +0 errors | 0 warnings | 0 notes + # Version 0.2.4 - This is the fourth submission to CRAN. diff --git a/inst/CITATION b/inst/CITATION index 8c720ca..3f5bd8f 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -4,7 +4,7 @@ bibentry( "manual", title = "{graphicalMCP}: Graphical multiple comparison procedures", author = as.person("Dong Xi and Ethan Brockmann"), - edition = "version 0.2.4", + edition = "version 0.2.5", year = 2024, url = "https://github.com/Gilead-BioStats/graphicalMCP" ) diff --git a/man/adjust_weights_parametric_util.Rd b/man/adjust_weights_parametric_util.Rd index b4ef3c9..58d1d07 100644 --- a/man/adjust_weights_parametric_util.Rd +++ b/man/adjust_weights_parametric_util.Rd @@ -28,8 +28,8 @@ solve_c_parametric( \item{x}{The root to solve for with \code{stats::uniroot()}.} \item{hypotheses}{A numeric vector of hypothesis weights. Must be a vector of -values between 0 & 1 (inclusive). The length should match the length of -\code{p}. The sum of hypothesis weights should not exceed 1.} +values between 0 & 1 (inclusive). The sum of hypothesis weights should not +exceed 1.} \item{test_corr}{(Optional) A numeric matrix of correlations between test statistics, which is needed to perform parametric tests using @@ -53,14 +53,6 @@ algorithm. The default is 1e-6.} \item{releps}{(Optional) A numeric scalar for the relative error tolerance as double, which is needed to perform parametric tests using the \code{mvtnorm::GenzBretz} algorithm. The default is 0.} - -\item{p}{(Optional) A numeric vector of p-values (unadjusted, raw), whose -values should be between 0 & 1. The length should match the length of -\code{hypotheses}.} - -\item{test_groups}{(Optional) A list of numeric vectors specifying hypotheses -to test together. Grouping is needed to correctly perform Simes and -parametric tests.} } \value{ \itemize{