Merge pull request #62 from Lifebrain/grid

Grid

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: metagam
 Type: Package
 Title: Meta-Analysis of Generalized Additive Models
-Version: 0.4.0
+Version: 0.4.0.9000
 Authors@R: c(person("Oystein", "Sorensen", 
                     email = "[email protected]", 
                     role = c("aut", "cre"),
@@ -31,7 +31,7 @@ Imports:
     ggplot2,
     metafor,
     rlang
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests: 
     roxygen2,
     knitr,

R/metagam_package.R

@@ -19,5 +19,3 @@
 #'
 #' @importFrom rlang .data
 NULL
-
-

R/misc.R

@@ -88,6 +88,12 @@ extract_model_fits <- function(model, term_list, grid, type){
     Map(function(term, xvar){
       newdat <- create_newdat(xvar = xvar, grid = grid, type = type)
 
+      missing_vars <- setdiff(names(model$var.summary), colnames(newdat))
+      for(mv in missing_vars) {
+        eval(parse(text = paste0("newdat$", mv, "<- rep(model$var.summary[['",
+                                 mv, "']][[1]], nrow(newdat))")))
+      }
+
       pred <- stats::predict(model, newdata = newdat, type = type,
                              se.fit = TRUE, terms = term)
 

R/plot_metagam.R

@@ -42,7 +42,6 @@ plot.metagam <- function(x, term = NULL, ci = "none", legend = FALSE,
     metadat <- x$meta_models$predictions
   }
 
-
   xvars <- x$term_list[[term]]$xvars
   metadat <- metadat[, c(xvars, "estimate", "se")]
 
@@ -63,6 +62,10 @@ plot.metagam <- function(x, term = NULL, ci = "none", legend = FALSE,
       ret$model <- nms[[ind]]
       ret
     })
+
+    common_cols <- Reduce(intersect, lapply(dat, colnames))
+    dat <- lapply(dat, function(df) df[, common_cols, drop = FALSE])
+
     dat <- do.call(rbind, dat)
     dat <- dat[, c(xvars, "fit", "se.fit", "model")]
 

news.md

@@ -1,3 +1,8 @@
+# metagam (development versions)
+
+- Added a workaround which allows not providing the unused variables when the
+  terms argument is used.
+
 # metagam version 0.4.0
 
 - Added a `meta_only` option to `plot.metagam()`.