Merge pull request #224 from RcppCore/bugfix/setequal

fix setequal bug

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2015-01-02  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/sugar/functions/setdiff.h: fix for setequals
+        * inst/unitTests/cpp/sugar.cpp: unit tests
+        * inst/unitTests/runit.sugar.R: unit tests
+
 2015-01-01  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/sugar/functions/mean.h: Return type is double, not

inst/include/Rcpp/sugar/functions/setdiff.h

@@ -76,8 +76,6 @@ namespace sugar{
             lhs_set( get_const_begin(lhs), get_const_end(lhs) ),
             rhs_set( get_const_begin(rhs), get_const_end(rhs) )
         {
-
-            std::for_each( rhs_set.begin(), rhs_set.end(), RemoveFromSet<SET>(lhs_set) ) ;
         }
 
         bool get() const {

inst/unitTests/cpp/sugar.cpp

@@ -592,10 +592,22 @@ LogicalVector runit_duplicated( CharacterVector x){
 IntegerVector runit_union( IntegerVector x, IntegerVector y){
     return union_( x, y) ;
 }
+
 // [[Rcpp::export]]
 IntegerVector runit_setdiff( IntegerVector x, IntegerVector y){
     return setdiff( x, y) ;
 }
+
+// [[Rcpp::export]]
+bool runit_setequal_integer(IntegerVector x, IntegerVector y) {
+    return setequal(x, y);
+}
+
+// [[Rcpp::export]]
+bool runit_setequal_character(CharacterVector x, CharacterVector y) {
+    return setequal(x, y);
+}
+
 // [[Rcpp::export]]
 IntegerVector runit_intersect( IntegerVector x, IntegerVector y){
     return intersect( x, y ) ;

inst/unitTests/runit.sugar.R

@@ -634,6 +634,12 @@ if (.runThisTest) {
         checkEquals(sort(runit_setdiff( 1:10, 1:5 )), sort(setdiff( 1:10, 1:5)))
     }
 
+    test.setequal <- function() {
+        checkTrue(runit_setequal_integer(1:10, 10:1))
+        checkTrue(runit_setequal_character(c("a", "b", "c"), c("c", "b", "a")))
+        checkTrue(!runit_setequal_character(c("a", "b"), c("c")))
+    }
+
     test.union <- function(){
         checkEquals(sort(runit_union( 1:10, 1:5 )), sort(union( 1:10, 1:5 )))
     }
@@ -676,22 +682,22 @@ if (.runThisTest) {
     }
 
     ## Additions made 1 Jan 2015
-    
+
     test.mean.integer <- function() {
         v1 <- seq(-100L, 100L)
         v2 <- c(v1, NA)
         checkEquals(mean(v1), meanInteger(v1), "mean of integer vector")
         checkEquals(mean(v2), meanInteger(v2), "mean of integer vector with NA")
     }
-    
+
     test.mean.numeric <- function() {
         v1 <- seq(-100, 100)
         v2 <- c(v1, NA)
         v3 <- c(v1, Inf)
         checkEquals(mean(v1), meanNumeric(v1), "mean of numeric vector")
         checkEquals(mean(v2), meanNumeric(v2), "mean of numeric vector with NA")
         checkEquals(mean(v3), meanNumeric(v3), "mean of numeric vector with Inf")
-    }    
+    }
 
     test.mean.complex <- function() {
         v1 <- seq(-100, 100)  + 1.0i
@@ -708,5 +714,5 @@ if (.runThisTest) {
         checkEquals(mean(v1), meanLogical(v1), "mean of logical vector")
         checkEquals(mean(v2), meanLogical(v2), "mean of logical vector with NA")
     }
-    
+
 }