combined_network %n% ".combiner" can now be a vector of compatible combiners.

Author: krivit

R/combine.networks.R

@@ -218,7 +218,8 @@ uncombine_network <- function(nw, populate = TRUE) {
 #' This is used primarily by developers to provide informative error
 #' messages.
 #'
-#' @param combiner the combiner name (typically `nw %n% ".combiner"`)
+#' @param combiner the combiner name (typically the first element of
+#'   `nw %n% ".combiner"`)
 #'
 #' @param description a named character vector or list with elements
 #'   `constructor`, `element`, `elements`, `construct`, `id`, and
@@ -356,11 +357,11 @@ as.networkLite.combined_networks <- function(x, ...){
 #' @keywords internal
 #' @export
 assert_combined_network <- function(nw, combiners, term = TRUE, call = rlang::caller_env()) {
-  if (!(nw %n% ".combiner" %||% "") %in% combiners) {
+  if (!any(nw%n%".combiner" %in% combiners)) {
     info <- map(combiners, ergm.multi_combiner)
     valid <- paste.and(paste0(map_chr(info, "construct"), " constructed by ", sQuote(map_chr(info, "constructor"))),
                        con = "nor")
-    msg <- paste0("This network is not a ", valid, " at its top level.")
+    msg <- paste0("This network is not a ", valid, " (nor compatible) at its top level.")
     if (term) ergm_Init_stop(msg)
     else abort(msg, call = call)
     FALSE

R/multinet.R

@@ -96,7 +96,7 @@ as_tibble.combined_networks<-function(x,attrnames=(match.arg(unit)%in%c("vertice
 
   out <- al[attrnames] %>% lapply(simplify_simple, ...) %>% as_tibble()
 
-  combiner <- x%n%".combiner"
+  combiner <- (x%n%".combiner")[1]
   if (!is.null(i <- ergm.multi_combiner(combiner)[["id"]])) out[[i]] <- seq_len(nrow(out))
   if (!is.null(i <- ergm.multi_combiner(combiner)[["name"]])) out[[i]] <- names(x%n%".snl")
 

R/print.combined_networks.R

@@ -11,7 +11,7 @@
 .print_combined_networks_info <- function(x, ...){
   cat(" Combined ", length(x%n%".snl"), " networks by ",
       sQuote(NVL3(x%n%".combiner",
-                  ergm.multi_combiner(.)$combiner,
+                  ergm.multi_combiner(.[1])$combiner,
                   "combine_networks()")), ":\n", sep = "")
   nattrs <- x%n%".snattr"
   nids <- format(seq_along(nattrs$n))