test sum(complex vector) and quiet when calling setRefClass

romainfrancois · romainfrancois · commit 1e456e87702e · 2014-04-17T18:10:16.000+02:00
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1157,6 +1157,10 @@ runit_sum <- function(xx) {
     .Call('RcppTest_runit_sum', PACKAGE = 'RcppTest', xx)
 }
 
+runit_sum_cplx <- function(xx) {
+    .Call('RcppTest_runit_sum_cplx', PACKAGE = 'RcppTest', xx)
+}
+
 runit_cumsum <- function(xx) {
     .Call('RcppTest_runit_cumsum', PACKAGE = 'RcppTest', xx)
 }
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -4449,6 +4449,22 @@ BEGIN_RCPP
     return __sexp_result;
 END_RCPP
 }
+// runit_sum_cplx
+Rcomplex runit_sum_cplx(ComplexVector xx);
+extern "C"  SEXP RcppTest_runit_sum_cplx(SEXP xxSEXP) {
+BEGIN_RCPP
+    SEXP __sexp_result;
+    {
+        Rcpp::RNGScope __rngScope;
+        Rcpp::traits::input_parameter< ComplexVector >::type xx(xxSEXP );
+        Rcomplex __result = runit_sum_cplx(xx);
+        PROTECT(__sexp_result = Rcpp::wrap(__result));
+    }
+    UNPROTECT(1);
+    return __sexp_result;
+END_RCPP
+}
+
 // runit_cumsum
 NumericVector runit_cumsum(NumericVector xx);
 extern "C"  SEXP RcppTest_runit_cumsum(SEXP xxSEXP) {
diff --git a/src/sugar.cpp b/src/sugar.cpp
@@ -470,7 +470,6 @@ List runit_beta( NumericVector nn, NumericVector kk){
     	_["VP"] = beta(nn, 5.0 )
     	) ;
 }
-
 // [[Rcpp::export]]
 List runit_psigamma( NumericVector nn, NumericVector kk){
     return List::create(
@@ -502,6 +501,11 @@ double runit_sum( NumericVector xx){
     return sum( xx ) ;
 }
 
+// [[Rcpp::export]]
+Rcomplex runit_sum_cplx( ComplexVector xx){
+    return sum( xx ) ;
+}
+
 // [[Rcpp::export]]
 NumericVector runit_cumsum( NumericVector xx ){
     NumericVector res = cumsum( xx ) ;
diff --git a/tests/testthat/test-misc.R b/tests/testthat/test-misc.R
@@ -74,11 +74,11 @@ test_that( "StrechyList correctly builds pairlists", {
 })
 
 test_that( "Reference works", {
-    Instrument <- setRefClass(
+    Instrument <- suppressWarnings(setRefClass(
        Class="Instrument",
        fields=list("id"="character", "description"="character"), 
        where = environment()
-    )
+    ))
     Instrument$accessors(c("id", "description"))
     
     instrument <- Instrument$new(id="AAPL", description="Apple")
diff --git a/tests/testthat/test-sugar.R b/tests/testthat/test-sugar.R
@@ -436,6 +436,10 @@ test_that("sugar sum functions work", {
     expect_equal( runit_cumsum(x), cumsum(x) )
     x[4] <- NA
     expect_equal( runit_cumsum(x), cumsum(x) )
+    
+    y <- rnorm(10) + rnorm(10)*1i
+    expect_equal( runit_sum_cplx(y), sum(y) )
+    
 })
 
 test_that( "rounding functions work", {

Original file line number	Diff line number	Diff line change
`@@ -1157,6 +1157,10 @@ runit_sum <- function(xx) {`
`1157`	`1157`	`.Call('RcppTest_runit_sum', PACKAGE = 'RcppTest', xx)`
`1158`	`1158`	`}`
`1159`	`1159`
	`1160`	`+runit_sum_cplx <- function(xx) {`
	`1161`	`+ .Call('RcppTest_runit_sum_cplx', PACKAGE = 'RcppTest', xx)`
	`1162`	`+}`
	`1163`	`+`
`1160`	`1164`	`runit_cumsum <- function(xx) {`
`1161`	`1165`	`.Call('RcppTest_runit_cumsum', PACKAGE = 'RcppTest', xx)`
`1162`	`1166`	`}`