some more sugar RNGs

so far: unif, norm, gamma, beta

Author: eddelbuettel

ChangeLog

@@ -1,11 +1,16 @@
+2016-07-24  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/unitTests/cpp/rmath.cpp: More RNG unit tests for sugar variants
+        * inst/unitTests/runit.rmath.R: idem
+
 2016-07-22  James J Balamuta  <[email protected]>
 
         * inst/unitTests/cpp/rmath.cpp: Added unit test functions for Rmath
         random number generators.
         * inst/unitTests/runit.rmath.R: idem
-        * inst/include/Rcpp/Environment.h: Added get() & find() that accept 
+        * inst/include/Rcpp/Environment.h: Added get() & find() that accept
         a symbol
-        * inst/include/Rcpp.h: Modified header load order so that Symbol.h 
+        * inst/include/Rcpp.h: Modified header load order so that Symbol.h
         is now placed before Environment.h
 
 2016-07-21  Dirk Eddelbuettel  <[email protected]>

inst/unitTests/cpp/rmath.cpp

@@ -45,13 +45,18 @@ NumericVector runit_qnorm( double x, double a, double b ){
 // [[Rcpp::export]]
 NumericVector runit_rnorm( double a, double b ){
     NumericVector o(5);
-    
-    for(int i = 0; i < o.size(); i++)
+    for (int i = 0; i < o.size(); i++) {
         o[i] = R::rnorm(a, b);
-    
+    }
     return o;
 }
 
+// [[Rcpp::export]]
+NumericVector runit_rnorm_sugar(double a, double b) {
+    return Rcpp::rnorm(5, a, b);
+}
+
+
 // ------------------- Uniform Distribution
 
 // [[Rcpp::export]]
@@ -74,13 +79,17 @@ NumericVector runit_qunif( double x, double a, double b ){
 // [[Rcpp::export]]
 NumericVector runit_runif( double a, double b ){
     NumericVector o(5);
-    
-    for(int i = 0; i < o.size(); i++)
+    for (int i = 0; i < o.size(); i++) {
         o[i] = R::runif(a, b);
-    
+    }
     return o;
 }
 
+// [[Rcpp::export]]
+NumericVector runit_runif_sugar( double a, double b ){
+    return Rcpp::runif(5, a, b);
+}
+
 
 // ------------------- Gamma Distribution
 
@@ -102,15 +111,19 @@ NumericVector runit_qgamma( double x, double a, double b ){
 }
 
 // [[Rcpp::export]]
-NumericVector runit_rgamma( double a, double b ){
+NumericVector runit_rgamma(double a, double b) {
     NumericVector o(5);
-    
-    for(int i = 0; i < o.size(); i++)
+    for (int i = 0; i < o.size(); i++) {
         o[i] = R::rgamma(a, b);
-    
+    }
     return o;
 }
 
+// [[Rcpp::export]]
+NumericVector runit_rgamma_sugar(double a, double b) {
+    return Rcpp::rgamma(5, a, b);
+}
+
 
 // ------------------- Beta Distribution
 
@@ -132,15 +145,19 @@ NumericVector runit_qbeta( double x, double a, double b ){
 }
 
 // [[Rcpp::export]]
-NumericVector runit_rbeta( double a, double b ){
+NumericVector runit_rbeta(double a, double b) {
     NumericVector o(5);
-    
-    for(int i = 0; i < o.size(); i++)
+    for (int i = 0; i < o.size(); i++) {
         o[i] = R::rbeta(a, b);
-    
+    }
     return o;
 }
 
+// [[Rcpp::export]]
+NumericVector runit_rbeta_sugar(double a, double b) {
+    return Rcpp::rbeta(5, a, b);
+}
+
 
 // ------------------- Log Normal Distribution
 

inst/unitTests/runit.rmath.R

@@ -1,7 +1,8 @@
 #!/usr/bin/env r
 # -*- mode: R; ess-indent-level: 4; tab-width: 4; indent-tabs-mode: nil; -*
 #
-# Copyright (C) 2012 - 2014  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2012 - 2016  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2016         Dirk Eddelbuettel and James J Balamuta
 #
 # This file is part of Rcpp.
 #
@@ -43,14 +44,14 @@ if (.runThisTest) {
                     msg = " rmath.qnorm")
 
         set.seed(333)
-        rcpp_result <- runit_rnorm(a, b)
-        set.seed(333)
-        
         r_result <- rnorm(5, a, b)
+        set.seed(333)
+        rcpp_result <- runit_rnorm(a, b)
+        checkEquals(rcpp_result, r_result, msg = " rmath.rnorm")
 
-        checkEquals(rcpp_result,
-                    r_result,
-                    msg = " rmath.rnorm")
+        set.seed(333)
+        rcpp_result_sugar <- runit_rnorm_sugar(a, b)
+        checkEquals(rcpp_result_sugar, r_result, msg = " rmath.rnorm.sugar")
     }
 
     test.rmath.unif <- function() {
@@ -71,16 +72,15 @@ if (.runThisTest) {
                       qunif(x, a, b, lower=FALSE, log=FALSE), qunif(log(x), a, b, lower=FALSE, log=TRUE)),
                     msg = " rmath.qunif")
 
-        
+        set.seed(333)
+        r_result <- runif(5, a, b)
         set.seed(333)
         rcpp_result <- runit_runif(a, b)
+        checkEquals(rcpp_result, r_result, msg = " rmath.runif")
+
         set.seed(333)
-        
-        r_result <- runif(5, a, b)
-        
-        checkEquals(rcpp_result,
-                    r_result,
-                    msg = " rmath.runif")
+        rcpp_result_sugar <- runit_runif_sugar(a, b)
+        checkEquals(rcpp_result_sugar, r_result, msg = " rmath.runif.sugar")
     }
 
     test.rmath.gamma <- function() {
@@ -101,15 +101,15 @@ if (.runThisTest) {
                       qgamma(x, a, b, lower=FALSE, log=FALSE), qgamma(log(x), a, b, lower=FALSE, log=TRUE)),
                     msg = " rmath.qgamma")
 
+        set.seed(333)
+        r_result <- rgamma(5, a, b)
         set.seed(333)
         rcpp_result <- runit_rgamma(a, b)
+        checkEquals(rcpp_result, r_result, msg = " rmath.rgamma")
+
         set.seed(333)
-        
-        r_result <- rgamma(5, a, b)
-        
-        checkEquals(rcpp_result,
-                    r_result,
-                    msg = " rmath.rgamma")
+        rcpp_result_sugar <- runit_rgamma_sugar(a, b)
+        checkEquals(rcpp_result_sugar, r_result, msg = " rmath.rgamma.sugar")
     }
 
     test.rmath.beta <- function() {
@@ -130,15 +130,16 @@ if (.runThisTest) {
                       qbeta(x, a, b, lower=FALSE, log=FALSE), qbeta(log(x), a, b, lower=FALSE, log=TRUE)),
                     msg = " rmath.qbeta")
 
+        set.seed(333)
+        r_result <- rbeta(5, a, b)
         set.seed(333)
         rcpp_result <- runit_rbeta(a, b)
+        checkEquals(rcpp_result, r_result, msg = " rmath.rbeta")
+
         set.seed(333)
+        rcpp_result_sugar <- runit_rbeta(a, b)
+        checkEquals(rcpp_result_sugar, r_result, msg = " rmath.rbeta.sugar")
 
-        r_result <- rbeta(5, a, b)
-        
-        checkEquals(rcpp_result,
-                    r_result,
-                    msg = " rmath.rbeta")
     }