use match for intersect

xoopR · Oct 15, 2021 · fac186f · fac186f
1 parent 1d69eff
commit fac186f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,7 +13,7 @@ Authors@R:
              email = "[email protected]"))
 Description: An object-oriented package for mathematical sets, upgrading the current gold-standard {sets}. Many forms of mathematical sets are implemented, including (countably finite) sets, tuples, intervals (countably infinite or uncountable), and fuzzy variants. Wrappers extend functionality by allowing symbolic representations of complex operations on sets, including unions, (cartesian) products, exponentiation, and differences (asymmetric and symmetric).
 LinkingTo: Rcpp
-Imports: checkmate, Rcpp, R6, utils
+Imports: checkmate, ooplah, Rcpp, R6, utils
 Suggests: knitr, testthat, devtools, rmarkdown
 License: MIT + file LICENSE
 LazyData: true

diff --git a/NAMESPACE b/NAMESPACE
@@ -193,6 +193,7 @@ export(testSetList)
 export(testSubset)
 export(testTuple)
 export(useUnicode)
+import(ooplah)
 importFrom(R6,R6Class)
 importFrom(Rcpp,sourceCpp)
 useDynLib(set6, .registration = TRUE)
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # set6 0.2.4
 
 * Patch for R devel
+* Imported ooplah
 
 # set6 0.2.3
 

diff --git a/R/operation_setintersect.R b/R/operation_setintersect.R
@@ -53,10 +53,9 @@
 setintersect <- function(x, y) {
   if (testCountablyFinite(x) & testCountablyFinite(y) & !inherits(x, "SetWrapper") &
     !inherits(y, "SetWrapper")) {
-    return(Set$new(elements = intersect(
-      vapply(x$elements, as.character, character(1)),
-      vapply(y$elements, as.character, character(1))
-    )))
+    elx <- vcapply(x$elements, as.character)
+    eli <- x$elements[match(vcapply(y$elements, as.character), elx, 0L)]
+    return(Set$new(elements = eli))
   }
 
   if (getR6Class(y) == "Universal") {