Merge branch 'anova-interaction-condition'

Fixes issue #463
vegandevs · Jan 29, 2022 · 47e9fc3 · 47e9fc3
2 parents 790184c + 464be5e
commit 47e9fc3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/R/anova.ccabyterm.R b/R/anova.ccabyterm.R
@@ -60,8 +60,10 @@
         trms <- scope
     else
         trms <- drop.scope(object)
-    trmlab <- trms[trms %in% attr(terms(object$terminfo),
-                                      "term.labels")]
+    ## Condition() not considered marginal
+    alltrms <- intersect(attr(terms(object$terminfo), "term.labels"),
+                         attr(terms(object), "term.labels"))
+    trmlab <- intersect(alltrms, trms)
     if (length(trmlab) == 0)
         stop("the scope was empty: no available marginal terms")
     ## baseline: all terms
@@ -87,7 +89,7 @@
     if (is.null(ass))
         stop("old style result object: update() your model")
     ## analyse only terms of 'ass' thar are in scope
-    scopeterms <- which(attr(terms(object$terminfo), "term.labels") %in% trms)
+    scopeterms <- which(alltrms %in% trmlab)
     mods <- lapply(scopeterms, function(i, ...)
            permutest(ordConstrained(Y, X[, ass != i, drop=FALSE], Z, "pass"),
                      permutations, ...), ...)