use RUnit for testing

Author: jjallaire

DESCRIPTION

@@ -18,7 +18,7 @@ Description: High level functions for doing parallel programming with 'Rcpp'.
   For example, the parallelFor() function can be used to convert the work of 
   a standard serial "for" loop into a parallel one and the parallelReduce() 
   function can be used for accumulating aggregate or other values.
-Suggests: Rcpp, testthat
+Suggests: Rcpp, RUnit
 SystemRequirements: GNU make, Windows: cmd.exe and cscript.exe, Solaris: g++ is required
 License: GPL-2
 URL: http://rcppcore.github.io/RcppParallel, https://github.com/RcppCore/RcppParallel

tests/testthat/cpp/distance.cpp inst/tests/cpp/distance.cpptests/testthat/cpp/distance.cpp renamed to inst/tests/cpp/distance.cpp

@@ -66,7 +66,7 @@ NumericMatrix rcpp_js_distance(NumericMatrix mat) {
          double d2 = kl_divergence(row2.begin(), row2.end(), avg.begin());
 
          // write to output matrix
-         rmat(i,j) = std::sqrt((double)(.5 * (d1 + d2)));
+         rmat(i,j) = std::sqrt(.5 * (d1 + d2));
       }
    }
 

tests/testthat/cpp/innerproduct.cpp inst/tests/cpp/innerproduct.cpptests/testthat/cpp/innerproduct.cpp renamed to inst/tests/cpp/innerproduct.cpp

@@ -10,18 +10,14 @@ using namespace Rcpp;
 #include <cmath>
 #include <algorithm>
 
-double timesTwo(double x) {
-   return x * 2;
-}
-
 // [[Rcpp::export]]
-NumericMatrix matrixTimesTwo(NumericMatrix orig) {
+NumericMatrix matrixSqrt(NumericMatrix orig) {
 
   // allocate the matrix we will return
   NumericMatrix mat(orig.nrow(), orig.ncol());
 
   // transform it
-  std::transform(orig.begin(), orig.end(), mat.begin(), ::timesTwo);
+  std::transform(orig.begin(), orig.end(), mat.begin(), ::sqrt);
 
   // return the new matrix
   return mat;
@@ -30,7 +26,7 @@ NumericMatrix matrixTimesTwo(NumericMatrix orig) {
 #include <RcppParallel.h>
 using namespace RcppParallel;
 
-struct TimesTwo : public Worker
+struct SquareRoot : public Worker
 {
    // source matrix
    const RMatrix<double> input;
@@ -39,28 +35,29 @@ struct TimesTwo : public Worker
    RMatrix<double> output;
 
    // initialize with source and destination
-   TimesTwo(const NumericMatrix input, NumericMatrix output) 
+   SquareRoot(const NumericMatrix input, NumericMatrix output) 
       : input(input), output(output) {}
 
+   // take the square root of the range of elements requested
    void operator()(std::size_t begin, std::size_t end) {
       std::transform(input.begin() + begin, 
                      input.begin() + end, 
                      output.begin() + begin, 
-                     ::timesTwo);
+                     ::sqrt);
    }
 };
 
 // [[Rcpp::export]]
-NumericMatrix parallelMatrixTimesTwo(NumericMatrix x) {
+NumericMatrix parallelMatrixSqrt(NumericMatrix x) {
 
   // allocate the output matrix
   NumericMatrix output(x.nrow(), x.ncol());
 
-  // TimesTwo functor (pass input and output matrixes)
-  TimesTwo timesTwo(x, output);
+  // SquareRoot functor (pass input and output matrixes)
+  SquareRoot squareRoot(x, output);
 
   // call parallelFor to do the work
-  parallelFor(0, x.nrow() * x.ncol(), timesTwo);
+  parallelFor(0, x.nrow() * x.ncol(), squareRoot);
 
   // return the output matrix
   return output;

tests/testthat/cpp/malloc.cpp inst/tests/cpp/malloc.cpptests/testthat/cpp/malloc.cpp renamed to inst/tests/cpp/malloc.cpp

@@ -0,0 +1,14 @@
+
+sourceCpp(system.file("tests/cpp/distance.cpp", package = "RcppParallel")) 
+
+test.distance <- function() {
+   
+   n  = 1000
+   m = matrix(runif(n*10), ncol = 10)
+   m = m/rowSums(m)
+   
+   checkEquals(
+      rcpp_js_distance(m), 
+      rcpp_parallel_js_distance(m)
+   )
+}

tests/testthat/cpp/sum.cpp inst/tests/cpp/sum.cpptests/testthat/cpp/sum.cpp renamed to inst/tests/cpp/sum.cpp

@@ -0,0 +1,13 @@
+
+sourceCpp(system.file("tests/cpp/innerproduct.cpp", package = "RcppParallel"))
+
+test.innerproduct <- function() {
+   
+   x <- runif(1000000)
+   y <- runif(1000000)
+   
+   checkEquals(
+      innerProduct(x, y), 
+      parallelInnerProduct(x, y)
+   )
+}

tests/testthat/cpp/transform.cpp inst/tests/cpp/transform.cpptests/testthat/cpp/transform.cpp renamed to inst/tests/cpp/transform.cpp

@@ -0,0 +1,6 @@
+sourceCpp(system.file("tests/cpp/malloc.cpp", package = "RcppParallel"))
+
+test.malloc <- function() {
+   tbbMalloc()   
+}
+

inst/tests/runit.distance.R

@@ -0,0 +1,12 @@
+
+sourceCpp(system.file("tests/cpp/sum.cpp", package = "RcppParallel"))
+
+test.sum <- function() {
+   
+   v <- as.numeric(c(1:10000000))
+   
+   checkEquals(
+      vectorSum(v), 
+      parallelVectorSum(v)
+   )
+}