docs, fixes in variable exponent

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2020-07-17.
+Once it is accepted, delete this file and tag the release (commit 502c918e89).

R/SetWrapper_ExponentSet.R

@@ -6,7 +6,8 @@
 ExponentSet <- R6Class("ExponentSet",
   inherit = ProductSet,
   public = list(
-    #' @description Create a new `ExponentSet` object. It is not recommended to construct this class directly.
+    #' @description Create a new `ExponentSet` object. It is not recommended to construct this
+    #' class directly.
     #' @param set [Set] to wrap.
     #' @param power numeric. Power to raise Set to.
     #' @return A new `ExponentSet` object.
@@ -53,38 +54,36 @@ ExponentSet <- R6Class("ExponentSet",
     #' @description Tests if elements `x` are contained in `self`.
     #' @template param_xall
     #' @param bound logical
-    #' @return If `all == TRUE` then returns `TRUE` if all `x` are contained in `self`, otherwise `FALSE`.
-    #' If `all == FALSE` returns a vector of logicals corresponding to the length of `x`, representing
-    #' if each is contained in `self`. If `bound == TRUE` then an element is contained in `self` if it
-    #' is on or within the (possibly-open) bounds of `self`, otherwise `TRUE` only if the element is within
-    #' `self` or the bounds are closed.
+    #' @return If `all == TRUE` then returns `TRUE` if all `x` are contained in `self`,
+    #' otherwise `FALSE`. If `all == FALSE` returns a vector of logicals corresponding to the
+    #' length of `x`, representing if each is contained in `self`. If `bound == TRUE` then an
+    #' element is contained in `self` if it is on or within the (possibly-open) bounds of `self`,
+    #' otherwise `TRUE` only if the element is within `self` or the bounds are closed.
     contains = function(x, all = FALSE, bound = FALSE) {
 
-      if (self$power == "n") {
-        if (!testTuple(x)) {
-          stop("Variable exponent set can only perform containedness checks on a single tuple.")
-        } else {
-          if (x$length == 1) {
-            return(self$wrappedSets[[1]]$contains(x$elements[[1]], all, bound))
-          } else {
-            return(setpower(self$wrappedSets[[1]], x$length)$contains(x, all, bound))
-          }
-        }
-      }
-
       x <- listify(x)
 
-      ret <- sapply(x, function(el) {
-        if (!testSet(el)) {
-          el <- as.Set(el)
+      if (self$power == "n") {
+        len <- x[[1]]$length
+        if (len == 1) {
+         return(self$wrappedSets[[1]]$contains(unlist(rsapply(x, "elements", active = TRUE)),
+                                               all, bound))
+        } else {
+          return(setpower(self$wrappedSets[[1]], len)$contains(x, all, bound))
         }
+      } else {
+        ret <- sapply(x, function(el) {
+          if (!testSet(el)) {
+            el <- as.Set(el)
+          }
 
-        if (el$length != self$power) {
-          return(FALSE)
-        }
+          if (el$length != self$power) {
+            return(FALSE)
+          }
 
-        all(self$wrappedSets[[1]]$contains(el$elements, bound = bound))
-      })
+          all(self$wrappedSets[[1]]$contains(el$elements, bound = bound))
+        })
+      }
 
       returner(ret, all)
     }

R/operation_cleaner.R

@@ -11,6 +11,11 @@ operation_cleaner <- function(sets, operation_class, nest, simplify = TRUE) {
       } else if (is.null(wraps)) {
         return(x)
       } else {
+        if (inherits(x, "ExponentSet")) {
+          if (x$power == "n") {
+            return(x)
+          }
+        }
         return(wraps)
       }
     }))

R/operation_setpower.R

@@ -41,11 +41,12 @@
 #' x$contains(Tuple$new(0))
 #' x$contains(Tuple$new(0, 1))
 #' x$contains(Tuple$new(0, 1, 0, 0, 1, 1, 0))
-#' x$contains(Tuple$new(0, 2))
+#' x$contains(list(Tuple$new(0, 2), Tuple$new(1, 1)))
 #'
 #' @export
 setpower <- function(x, power, simplify = FALSE, nest = FALSE) {
-  if (getR6Class(x) == "UniversalSet") {
+  classx <- getR6Class(x)
+  if (classx == "UniversalSet") {
     return(x)
   }
 
@@ -55,11 +56,15 @@ setpower <- function(x, power, simplify = FALSE, nest = FALSE) {
     return(x)
   } else if (power == "n") {
     return(ExponentSet$new(x, power))
-  } else if (getR6Class(x) %in% c("Set", "FuzzySet", "Tuple", "FuzzyTuple") & simplify) {
+  } else if (classx %in% c("Set", "FuzzySet", "Tuple", "FuzzyTuple") & simplify) {
     x <- rep(list(x), power)
     return(do.call(setproduct, c(x, list(nest = nest, simplify = TRUE))))
-  } else if (inherits(x, "ExponentSet")) {
-    return(ExponentSet$new(x$wrappedSets[[1]], x$power * power))
+  } else if (classx == "ExponentSet") {
+    if (x$power == "n") {
+      return(x)
+    } else {
+      return(ExponentSet$new(x$wrappedSets[[1]], x$power * power))
+    }
   } else {
     return(ExponentSet$new(x, power))
   }

R/operation_setproduct.R

@@ -75,6 +75,12 @@ setproduct <- function(..., simplify = FALSE, nest = FALSE) {
   }
 
   classes <- sapply(sets, getR6Class)
+  if ("ExponentSet" %in% classes) {
+    varexp <- sapply(sets[classes == "ExponentSet"], function(x) x$power == "n")
+    if (any(varexp)) {
+      return(sets[classes == "ExponentSet"][which(varexp)[1]][[1]])
+    }
+  }
 
   if (length(unique(rsapply(sets, "strprint"))) == 1 & !simplify) {
     return(ExponentSet$new(sets[[1]], length(sets)))