Merge pull request #3 from sansan-inc/fix/komatsu/error-between

Enable to estimate a model without externality terms

lighthergm/R/estimate_between_param.R

@@ -47,12 +47,13 @@ estimate_between_param <- function(formula, network, block) {
   varnames <-
     statnet.common::list_rhs.formula(formula) %>%
     as.character()
-  dep_terms <- which(terms %>% purrr::map(function(t) {
-    dep <- t$dependence
-    is_dep <- is.null(dep) || dep
-  }) %>% unlist())
-  between_rhs <- varnames[-dep_terms]
-  between_formula <- as.formula(paste("g_logit ~ ", paste(between_rhs, collapse = " + ")))
+  dep_terms <-
+    terms %>% purrr::map(function(t) {
+      dep <- t$dependence
+      is_dep <- is.null(dep) || dep
+    }) %>% unlist()
+  between_rhs <- varnames[!dep_terms]
+  between_formula <- as.formula(glue::glue("g_logit ~ {paste(between_rhs, collapse = '+')}"))
 
   # Estimate logit
   between_logit <- ergm(

lighthergm/R/gof_lighthergm.R

@@ -63,12 +63,12 @@ separate_formulas <- function(target_formula) {
   net <- get(str_net, envir = environment(target_formula))
   terms <- ergm::ergm_model(target_formula)$terms
   varnames <- statnet.common::list_rhs.formula(target_formula) %>% as.character()
-  dep_terms <- which(terms %>% purrr::map(function(t) {
-    dep <- t$dependence
-    is_dep <- is.null(dep) || dep
-  }) %>% unlist())
-
-  between_rhs <- varnames[-dep_terms]
+  dep_terms <-
+    terms %>% purrr::map(function(t) {
+      dep <- t$dependence
+      is_dep <- is.null(dep) || dep
+    }) %>% unlist()
+  between_rhs <- varnames[!dep_terms]
   within_rhs <- varnames
 
   between_formula <- paste(str_net, "~", paste(between_rhs, collapse = " + "))