Made the append argument more flexible in to.long().

wviechtb · Aug 30, 2023 · 27cfafa · 27cfafa
1 parent 942bda6
commit 27cfafa
Show file tree

Hide file tree

Showing 123 changed files with 419 additions and 193 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: metafor
-Version: 4.3-14
-Date: 2023-08-29
+Version: 4.3-15
+Date: 2023-08-30
 Title: Meta-Analysis Package for R
 Authors@R: person(given = "Wolfgang", family = "Viechtbauer", role = c("aut","cre"), email = "[email protected]", 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.3-14 (2023-08-29)
+# metafor 4.3-15 (2023-08-30)
 
 - added `getmfopt()` and `setmfopt()` functions for getting and setting package options and made some of the options more flexible
 
@@ -26,6 +26,8 @@
 
 - made the `legend` argument more flexible in `funnel()`
 
+- made the `append` argument more flexible in `to.long()`
+
 - added a few more transformation functions
 
 - small bug fixes

diff --git a/R/to.long.r b/R/to.long.r
@@ -55,6 +55,30 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          data <- data.frame(data)
    }
 
+   doappend <- FALSE
+
+   if (has.data && is.logical(append) && isTRUE(append)) {
+      doappend <- TRUE
+      appendvars <- seq_len(ncol(data))
+   }
+
+   if (has.data && is.numeric(append)) {
+      doappend <- TRUE
+      append <- unique(round(append))
+      append <- append[which(append >= 1)]
+      append <- append[which(append <= ncol(data))]
+      append <- c(na.omit(append))
+      appendvars <- append
+   }
+
+   if (has.data && is.character(append)) {
+      doappend <- TRUE
+      append <- unique(append)
+      append <- pmatch(append, colnames(data))
+      append <- c(na.omit(append))
+      appendvars <- append
+   }
+
    mf <- match.call()
 
    ### get slab and subset arguments (will be NULL when unspecified)
@@ -700,8 +724,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
          dat[[3]] <- factor(dat[[3]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=4L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=4L),appendvars,drop=FALSE], dat)
 
       } else {
 
@@ -724,8 +748,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[1]] <- factor(dat[[1]])
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
       }
 
@@ -790,8 +814,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
          dat[[3]] <- factor(dat[[3]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- data.frame(data[rep(seq_len(k), each=4L),], dat)
+         if (doappend)
+            dat <- data.frame(data[rep(seq_len(k), each=4L),appendvars,drop=FALSE], dat)
 
       } else {
 
@@ -814,8 +838,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[1]] <- factor(dat[[1]])
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
       }
 
@@ -880,8 +904,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
          dat[[3]] <- factor(dat[[3]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=4L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=4L),appendvars,drop=FALSE], dat)
 
       } else {
 
@@ -904,8 +928,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[1]] <- factor(dat[[1]])
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
       }
 
@@ -965,8 +989,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
       dat[[1]] <- factor(dat[[1]])
       dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-      if (has.data && append)
-         dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+      if (doappend)
+         dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
    }
 
@@ -1027,8 +1051,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
       dat[[1]] <- factor(dat[[1]])
       dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-      if (has.data && append)
-         dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+      if (doappend)
+         dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
    }
 
@@ -1082,8 +1106,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
       dat[[1]] <- factor(dat[[1]])
 
-      if (has.data && append)
-         dat <- cbind(data, dat)
+      if (doappend)
+         dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
    }
 
@@ -1142,8 +1166,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
          dat[[1]] <- factor(dat[[1]])
          dat[[2]] <- factor(dat[[2]], levels=c(2,1))
 
-         if (has.data && append)
-            dat <- cbind(data[rep(seq_len(k), each=2L),], dat)
+         if (doappend)
+            dat <- cbind(data[rep(seq_len(k), each=2L),appendvars,drop=FALSE], dat)
 
       } else {
 
@@ -1164,8 +1188,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
          dat[[1]] <- factor(dat[[1]])
 
-         if (has.data && append)
-            dat <- cbind(data, dat)
+         if (doappend)
+            dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
       }
 
@@ -1221,8 +1245,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
       dat[[1]] <- factor(dat[[1]])
 
-      if (has.data && append)
-         dat <- cbind(data, dat)
+      if (doappend)
+         dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
    }
 
@@ -1278,8 +1302,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
       dat[[1]] <- factor(dat[[1]])
 
-      if (has.data && append)
-         dat <- cbind(data, dat)
+      if (doappend)
+         dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
    }
 
@@ -1348,8 +1372,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
          dat[[1]] <- factor(dat[[1]])
 
-         if (has.data && append)
-            dat <- cbind(data, dat)
+         if (doappend)
+            dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
       } else {
 
@@ -1371,8 +1395,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
          dat[[1]] <- factor(dat[[1]])
 
-         if (has.data && append)
-            dat <- cbind(data, dat)
+         if (doappend)
+            dat <- cbind(data[,appendvars,drop=FALSE], dat)
 
       }
 
@@ -1430,8 +1454,8 @@ data, slab, subset, add=1/2, to="none", drop00=FALSE, vlong=FALSE, append=TRUE,
 
       dat[[1]] <- factor(dat[[1]])
 
-      if (has.data && append)
-         dat <- data.frame(data, dat)
+      if (doappend)
+         dat <- data.frame(data[,appendvars,drop=FALSE], dat)
 
    }
 

diff --git a/R/zzz.r b/R/zzz.r
@@ -1,6 +1,6 @@
 .onAttach <- function(libname, pkgname) {
 
-   ver <- "4.3-14"
+   ver <- "4.3-15"
 
    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.3--14-brightgreen.svg)](https://www.metafor-project.org/doku.php/installation#development_version)
+[![devel Version](https://img.shields.io/badge/devel-4.3--15-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.7
 pkgdown_sha: ~
 articles:
   diagram: pkgdown/diagram.html
-last_built: 2023-08-29T19:59Z
+last_built: 2023-08-30T16:26Z
 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