Skip to content

Commit

Permalink
Merge pull request #5 from smartdata-analysis-and-statistics/Valentijn
Browse files Browse the repository at this point in the history
Added formatR to suggests
  • Loading branch information
NightlordTW committed Feb 19, 2024
2 parents af02eea + 3b7a8af commit 80c1d33
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Suggests:
logistf (>= 1.23),
testthat (>= 1.0.2),
knitr,
rmarkdown
rmarkdown,
formatR
License: GPL-3
Encoding: UTF-8
URL: https://github.com/smartdata-analysis-and-statistics/metamisc,
Expand Down
11 changes: 5 additions & 6 deletions R/metapred_measures.R
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,11 @@ plot.mp.cv.val <- function(x, y, ...)
#' @author Valentijn de Jong
#'
#' @param object A model fit object, such as \link{metapred} object.
#' @param method Character, method for meta-analysis passed to \link[metamisc]{valmeta} and \link[metamisc]{uvmeta}.
#' @param method Character, method for meta-analysis passed to
#' \link[metamisc]{valmeta} and \link[metamisc]{uvmeta}.
#' Defaults to "REML".
#' @param ... Other arguments passed to \link[metamisc]{metapred}, \link[metamisc]{valmeta} and \link[metamisc]{uvmeta}.
#' @param ... Other arguments passed to \link[metamisc]{metapred},
#' \link[metamisc]{valmeta} and \link[metamisc]{uvmeta}.
#'
#' @details Produces different object types depending on input.
#'
Expand All @@ -449,7 +451,6 @@ ma.mp.stratified.fit <- function(object, method = "REML", ...) {
with(m, data.frame(coefficients, variances, se, ci.lb, ci.ub, tau2, se.tau2, pi.lb, pi.ub))
}


#' @export
ma.perf <- function(object, method = "REML", test = "knha", ...) {
if (object$class[[1]] == "mp.perf" || object$class[[1]] == "recal") {
Expand Down Expand Up @@ -518,7 +519,6 @@ ma.perf <- function(object, method = "REML", test = "knha", ...) {
forest.metapred <- function(object, perfFUN = 1, step = NULL, method = "REML", model = NULL, ...)
forest.mp.cv.val(subset(object, step = step, model = model), perfFUN = perfFUN, method = method, ...)


#' Forest plot of a validation object.
#'
#' Draw a forest plot of the performance of an internally-externally cross-validated model.
Expand Down Expand Up @@ -549,7 +549,6 @@ forest.mp.cv.val <- function(object, perfFUN = 1, method = "REML", xlab = NULL,
forest.perf(perf(object, perfFUN = perfFUN, ...), method = method, xlab = xlab, ...)
}


forest.perf <- function(object, method = "REML", ...) {
if (is.null(theta.slab <- list(...)$theta.slab))
theta.slab <- as.character(object$val.strata)
Expand All @@ -567,7 +566,7 @@ forest.perf <- function(object, method = "REML", ...) {
plot(fp)
fp
}
#

# sampleBinary <- function(n = 50, J = 1, b = rep(log(2), J), alpha = NULL, col.names = NULL ) {
# J <- length(b)
# if (is.null(alpha)) alpha <- -log(sqrt(prod(exp(b))))
Expand Down
Binary file modified tests/testthat/Rplots.pdf
Binary file not shown.

0 comments on commit 80c1d33

Please sign in to comment.