nobs() returns number of estimates/studies.

wviechtb · Jul 1, 2024 · e614245 · e614245
1 parent 7c05e57
commit e614245
Show file tree

Hide file tree

Showing 125 changed files with 308 additions and 132 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: metafor
-Version: 4.7-21
-Date: 2024-06-29
+Version: 4.7-22
+Date: 2024-07-01
 Title: Meta-Analysis Package for R
 Authors@R: person(given = "Wolfgang", family = "Viechtbauer", role = c("aut","cre"), email = "wvb@metafor-project.org", comment = c(ORCID = "0000-0003-3463-4063"))
 Depends: R (>= 4.0.0), methods, Matrix, metadat, numDeriv

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# metafor 4.7-21 (2024-06-29)
+# metafor 4.7-22 (2024-07-01)
 
 - the `predict.rma()` and `predict.rma.ls()` functions now also accept a matrix as input that includes a column for the intercept term (in which case the `intercept` argument is ignored)
 
@@ -26,6 +26,8 @@
 
 - `selmodel()` gains a `subset` argument (to specify a subset of studies to which the selection function should apply)
 
+- `nobs()` now just returns the number of estimates, not the effective number of observations
+
 - added more tests
 
 # metafor 4.6-0 (2024-03-28)

diff --git a/R/forest.rma.r b/R/forest.rma.r
@@ -121,7 +121,7 @@ lty, fonts, cex, cex.lab, cex.axis, ...) {
          col <- c(par("fg"), .coladj(par("fg"), dark=-0.3, light=0.3)) # 1st = summary polygon, 2nd = PI
       } else {
          if (length(col) == 1L) # if user only specified one value, assume it is for the summary polygon
-            col <- c(col, .coladj(col, dark=-0.3, light=0.3))
+            col <- c(col, .coladj(par("fg"), dark=-0.3, light=0.3))
       }
 
       if (missing(border))

diff --git a/R/misc.func.hidden.r b/R/misc.func.hidden.r
@@ -1510,6 +1510,9 @@
    if (length(x) == 0L)
       stop(mstyle$stop(paste0("Argument '", argname, "' is of length 0.")), call.=FALSE)
 
+   if (is.character(x))
+      stop(mstyle$stop(paste0("Argument '", argname, "' is not a logical or numeric vector.")), call.=FALSE)
+
    if (is.logical(x)) {
       if (length(x) != k)
          stop(mstyle$stop(paste0("Length of the '", argname, "' argument (", length(x), ") is not of length k = ", k, ".")), call.=FALSE)

diff --git a/R/nobs.rma.r b/R/nobs.rma.r
@@ -4,7 +4,8 @@ nobs.rma <- function(object, ...) {
 
    .chkclass(class(object), must="rma")
 
-   n.obs <- object$k.eff - ifelse(object$method == "REML", 1, 0) * object$p.eff
+   #n.obs <- object$k.eff - ifelse(object$method == "REML", 1, 0) * object$p.eff
+   n.obs <- object$k
 
    return(n.obs)
 

diff --git a/R/zzz.r b/R/zzz.r
@@ -1,6 +1,6 @@
 .onAttach <- function(libname, pkgname) {
 
-   ver <- "4.7-21"
+   ver <- "4.7-22"
 
    loadmsg <- paste0("\nLoading the 'metafor' package (version ", ver, "). For an\nintroduction to the package please type: help(metafor)\n")
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ metafor: A Meta-Analysis Package for R
 [![R build status](https://github.com/wviechtb/metafor/workflows/R-CMD-check/badge.svg)](https://github.com/wviechtb/metafor/actions)
 [![Code Coverage](https://codecov.io/gh/wviechtb/metafor/branch/master/graph/badge.svg)](https://app.codecov.io/gh/wviechtb/metafor)
 [![CRAN Version](https://www.r-pkg.org/badges/version/metafor)](https://cran.r-project.org/package=metafor)
-[![devel Version](https://img.shields.io/badge/devel-4.7--21-brightgreen.svg)](https://www.metafor-project.org/doku.php/installation#development_version)
+[![devel Version](https://img.shields.io/badge/devel-4.7--22-brightgreen.svg)](https://www.metafor-project.org/doku.php/installation#development_version)
 [![Monthly Downloads](https://cranlogs.r-pkg.org/badges/metafor)](https://cranlogs.r-pkg.org/badges/metafor)
 [![Total Downloads](https://cranlogs.r-pkg.org/badges/grand-total/metafor)](https://cranlogs.r-pkg.org/badges/grand-total/metafor)
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/ISSUE_TEMPLATE.html b/docs/ISSUE_TEMPLATE.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/pkgdown/diagram.html b/docs/articles/pkgdown/diagram.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,7 +3,7 @@ pkgdown: 2.0.9
 pkgdown_sha: ~
 articles:
   diagram: pkgdown/diagram.html
-last_built: 2024-06-29T19:23Z
+last_built: 2024-07-01T20:02Z
 urls:
   reference: https://wviechtb.github.io/metafor/reference
   article: https://wviechtb.github.io/metafor/articles

diff --git a/docs/reference/addpoly.default.html b/docs/reference/addpoly.default.html
diff --git a/docs/reference/addpoly.html b/docs/reference/addpoly.html
diff --git a/docs/reference/addpoly.predict.rma.html b/docs/reference/addpoly.predict.rma.html
diff --git a/docs/reference/addpoly.rma.html b/docs/reference/addpoly.rma.html
diff --git a/docs/reference/aggregate.escalc.html b/docs/reference/aggregate.escalc.html
diff --git a/docs/reference/anova.rma.html b/docs/reference/anova.rma.html
diff --git a/docs/reference/baujat.html b/docs/reference/baujat.html
diff --git a/docs/reference/bldiag.html b/docs/reference/bldiag.html
diff --git a/docs/reference/blsplit.html b/docs/reference/blsplit.html
diff --git a/docs/reference/blup.html b/docs/reference/blup.html
diff --git a/docs/reference/coef.permutest.rma.uni.html b/docs/reference/coef.permutest.rma.uni.html
diff --git a/docs/reference/coef.rma.html b/docs/reference/coef.rma.html
diff --git a/docs/reference/confint.rma.html b/docs/reference/confint.rma.html
diff --git a/docs/reference/contrmat.html b/docs/reference/contrmat.html
diff --git a/docs/reference/conv.2x2.html b/docs/reference/conv.2x2.html
diff --git a/docs/reference/conv.delta.html b/docs/reference/conv.delta.html
diff --git a/docs/reference/conv.fivenum.html b/docs/reference/conv.fivenum.html
diff --git a/docs/reference/conv.wald.html b/docs/reference/conv.wald.html
diff --git a/docs/reference/cumul.html b/docs/reference/cumul.html
diff --git a/docs/reference/dfround.html b/docs/reference/dfround.html
diff --git a/docs/reference/emmprep.html b/docs/reference/emmprep.html
diff --git a/docs/reference/escalc.html b/docs/reference/escalc.html