Skip to content

Commit 72d74a8

Browse files
committed
remaining sugar rng tests
1 parent 4517da6 commit 72d74a8

File tree

3 files changed

+199
-144
lines changed

3 files changed

+199
-144
lines changed

ChangeLog

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
2016-07-24 Dirk Eddelbuettel <[email protected]>
22

3-
* inst/unitTests/cpp/rmath.cpp: More RNG unit tests for sugar variants
4-
* inst/unitTests/runit.rmath.R: idem
3+
* inst/unitTests/cpp/rmath.cpp: Added RNG unit tests for sugar variants
4+
* inst/unitTests/runit.rmath.R: Idem
55

66
2016-07-22 James J Balamuta <[email protected]>
77

8-
* inst/unitTests/cpp/rmath.cpp: Added unit test functions for Rmath
9-
random number generators.
8+
* inst/unitTests/cpp/rmath.cpp: Added unit tests for Rmath RNGs
109
* inst/unitTests/runit.rmath.R: idem
1110
* inst/include/Rcpp/Environment.h: Added get() & find() that accept
1211
a symbol

inst/unitTests/cpp/rmath.cpp

Lines changed: 112 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,19 @@ NumericVector runit_qlnorm( double x, double a, double b ){
179179
}
180180

181181
// [[Rcpp::export]]
182-
NumericVector runit_rlnorm( double a, double b ){
182+
NumericVector runit_rlnorm(double a, double b) {
183183
NumericVector o(5);
184-
185-
for(int i = 0; i < o.size(); i++)
184+
for (int i = 0; i < o.size(); i++) {
186185
o[i] = R::rlnorm(a, b);
187-
186+
}
188187
return o;
189188
}
190189

190+
// [[Rcpp::export]]
191+
NumericVector runit_rlnorm_sugar(double a, double b) {
192+
return Rcpp::rlnorm(5, a, b);
193+
}
194+
191195
// ------------------- Chi-Squared Distribution
192196

193197
// [[Rcpp::export]]
@@ -208,15 +212,19 @@ NumericVector runit_qchisq( double x, double a ){
208212
}
209213

210214
// [[Rcpp::export]]
211-
NumericVector runit_rchisq( double a ){
215+
NumericVector runit_rchisq(double a) {
212216
NumericVector o(5);
213-
214-
for(int i = 0; i < o.size(); i++)
217+
for (int i = 0; i < o.size(); i++) {
215218
o[i] = R::rchisq(a);
216-
219+
}
217220
return o;
218221
}
219222

223+
// [[Rcpp::export]]
224+
NumericVector runit_rchisq_sugar(double a) {
225+
return Rcpp::rchisq(5, a);
226+
}
227+
220228
// ------------------- Non-central Chi-Squared Distribution
221229

222230
// [[Rcpp::export]]
@@ -256,15 +264,19 @@ NumericVector runit_qf( double x, double a, double b ){
256264
}
257265

258266
// [[Rcpp::export]]
259-
NumericVector runit_rf( double a, double b ){
267+
NumericVector runit_rf(double a, double b) {
260268
NumericVector o(5);
261-
262-
for(int i = 0; i < o.size(); i++)
269+
for (int i = 0; i < o.size(); i++) {
263270
o[i] = R::rf(a, b);
264-
271+
}
265272
return o;
266273
}
267274

275+
// [[Rcpp::export]]
276+
NumericVector runit_rf_sugar(double a, double b) {
277+
return Rcpp::rf(5, a, b);
278+
}
279+
268280
// ------------------- Student t Distribution
269281

270282
// [[Rcpp::export]]
@@ -285,15 +297,19 @@ NumericVector runit_qt( double x, double a ){
285297
}
286298

287299
// [[Rcpp::export]]
288-
NumericVector runit_rt( double a ){
300+
NumericVector runit_rt(double a) {
289301
NumericVector o(5);
290-
291-
for(int i = 0; i < o.size(); i++)
302+
for(int i = 0; i < o.size(); i++) {
292303
o[i] = R::rt(a);
293-
304+
}
294305
return o;
295306
}
296307

308+
// [[Rcpp::export]]
309+
NumericVector runit_rt_sugar(double a) {
310+
return Rcpp::rt(5, a);
311+
}
312+
297313
// ------------------- Binomial Distribution
298314

299315
// [[Rcpp::export]]
@@ -314,15 +330,19 @@ NumericVector runit_qbinom( double x, double a, double b ){
314330
}
315331

316332
// [[Rcpp::export]]
317-
NumericVector runit_rbinom( double a, double b ){
333+
NumericVector runit_rbinom(double a, double b) {
318334
NumericVector o(5);
319-
320-
for(int i = 0; i < o.size(); i++)
335+
for(int i = 0; i < o.size(); i++) {
321336
o[i] = R::rbinom(a, b);
322-
337+
}
323338
return o;
324339
}
325340

341+
// [[Rcpp::export]]
342+
NumericVector runit_rbinom_sugar(double a, double b) {
343+
return Rcpp::rbinom(5, a, b);
344+
}
345+
326346
// ------------------- Cauchy Distribution
327347

328348
// [[Rcpp::export]]
@@ -343,15 +363,19 @@ NumericVector runit_qcauchy( double x, double a, double b ){
343363
}
344364

345365
// [[Rcpp::export]]
346-
NumericVector runit_rcauchy( double a, double b ){
366+
NumericVector runit_rcauchy(double a, double b) {
347367
NumericVector o(5);
348-
349-
for(int i = 0; i < o.size(); i++)
368+
for(int i = 0; i < o.size(); i++) {
350369
o[i] = R::rcauchy(a, b);
351-
370+
}
352371
return o;
353372
}
354373

374+
// [[Rcpp::export]]
375+
NumericVector runit_rcauchy_sugar(double a, double b) {
376+
return Rcpp::rcauchy(5, a, b);
377+
}
378+
355379
// ------------------- Exponential Distribution
356380

357381
// [[Rcpp::export]]
@@ -372,15 +396,19 @@ NumericVector runit_qexp( double x, double a ){
372396
}
373397

374398
// [[Rcpp::export]]
375-
NumericVector runit_rexp( double a ){
399+
NumericVector runit_rexp(double a) {
376400
NumericVector o(5);
377-
378-
for(int i = 0; i < o.size(); i++)
401+
for(int i = 0; i < o.size(); i++) {
379402
o[i] = R::rexp(a);
380-
403+
}
381404
return o;
382405
}
383406

407+
// [[Rcpp::export]]
408+
NumericVector runit_rexp_sugar(double a) {
409+
return Rcpp::rexp(5, a);
410+
}
411+
384412
// ------------------- Geometric Distribution
385413

386414
// [[Rcpp::export]]
@@ -401,15 +429,19 @@ NumericVector runit_qgeom( double x, double a ){
401429
}
402430

403431
// [[Rcpp::export]]
404-
NumericVector runit_rgeom( double a ){
432+
NumericVector runit_rgeom(double a) {
405433
NumericVector o(5);
406-
407-
for(int i = 0; i < o.size(); i++)
434+
for (int i = 0; i < o.size(); i++) {
408435
o[i] = R::rgeom(a);
409-
436+
}
410437
return o;
411438
}
412439

440+
// [[Rcpp::export]]
441+
NumericVector runit_rgeom_sugar(double a) {
442+
return Rcpp::rgeom(5, a);
443+
}
444+
413445
// ------------------- Hypergeometric Distribution
414446

415447
// [[Rcpp::export]]
@@ -430,15 +462,19 @@ NumericVector runit_qhyper( double x, double a, double b, double c ){
430462
}
431463

432464
// [[Rcpp::export]]
433-
NumericVector runit_rhyper( double a, double b, double c ){
465+
NumericVector runit_rhyper(double a, double b, double c) {
434466
NumericVector o(5);
435-
436-
for(int i = 0; i < o.size(); i++)
467+
for(int i = 0; i < o.size(); i++) {
437468
o[i] = R::rhyper(a, b, c);
438-
469+
}
439470
return o;
440471
}
441472

473+
// [[Rcpp::export]]
474+
NumericVector runit_rhyper_sugar(double a, double b, double c) {
475+
return Rcpp::rhyper(5, a, b, c);
476+
}
477+
442478
// ------------------- Negative Binomial Distribution
443479

444480
// [[Rcpp::export]]
@@ -459,15 +495,19 @@ NumericVector runit_qnbinom( double x, double a, double b ){
459495
}
460496

461497
// [[Rcpp::export]]
462-
NumericVector runit_rnbinom( double a, double b){
498+
NumericVector runit_rnbinom(double a, double b) {
463499
NumericVector o(5);
464-
465-
for(int i = 0; i < o.size(); i++)
500+
for(int i = 0; i < o.size(); i++) {
466501
o[i] = R::rnbinom(a, b);
467-
502+
}
468503
return o;
469504
}
470505

506+
// [[Rcpp::export]]
507+
NumericVector runit_rnbinom_sugar(double a, double b) {
508+
return Rcpp::rnbinom(5, a, b);
509+
}
510+
471511
// ------------------- Poisson Distribution
472512

473513
// [[Rcpp::export]]
@@ -488,15 +528,19 @@ NumericVector runit_qpois( double x, double a ){
488528
}
489529

490530
// [[Rcpp::export]]
491-
NumericVector runit_rpois( double a ){
531+
NumericVector runit_rpois(double a) {
492532
NumericVector o(5);
493-
494-
for(int i = 0; i < o.size(); i++)
533+
for(int i = 0; i < o.size(); i++) {
495534
o[i] = R::rpois(a);
496-
535+
}
497536
return o;
498537
}
499538

539+
// [[Rcpp::export]]
540+
NumericVector runit_rpois_sugar(double a) {
541+
return Rcpp::rpois(5, a);
542+
}
543+
500544
// ------------------- Weibull Distribution
501545

502546
// [[Rcpp::export]]
@@ -517,15 +561,19 @@ NumericVector runit_qweibull( double x, double a, double b ){
517561
}
518562

519563
// [[Rcpp::export]]
520-
NumericVector runit_rweibull( double a, double b ){
564+
NumericVector runit_rweibull(double a, double b) {
521565
NumericVector o(5);
522-
523-
for(int i = 0; i < o.size(); i++)
566+
for(int i = 0; i < o.size(); i++) {
524567
o[i] = R::rweibull(a, b);
525-
568+
}
526569
return o;
527570
}
528571

572+
// [[Rcpp::export]]
573+
NumericVector runit_rweibull_sugar(double a, double b) {
574+
return Rcpp::rweibull(5, a, b);
575+
}
576+
529577
// ------------------- Logistic Distribution
530578

531579
// [[Rcpp::export]]
@@ -546,15 +594,19 @@ NumericVector runit_qlogis( double x, double a, double b ){
546594
}
547595

548596
// [[Rcpp::export]]
549-
NumericVector runit_rlogis( double a, double b ){
597+
NumericVector runit_rlogis(double a, double b) {
550598
NumericVector o(5);
551-
552-
for(int i = 0; i < o.size(); i++)
599+
for(int i = 0; i < o.size(); i++) {
553600
o[i] = R::rlogis(a, b);
554-
601+
}
555602
return o;
556603
}
557604

605+
// [[Rcpp::export]]
606+
NumericVector runit_rlogis_sugar(double a, double b) {
607+
return Rcpp::rlogis(5, a, b);
608+
}
609+
558610
// ------------------- Non-central Beta Distribution
559611

560612
// [[Rcpp::export]]
@@ -632,11 +684,15 @@ NumericVector runit_qwilcox( double x, double a, double b ){
632684
}
633685

634686
// [[Rcpp::export]]
635-
NumericVector runit_rwilcox( double a, double b ){
687+
NumericVector runit_rwilcox(double a, double b) {
636688
NumericVector o(5);
637-
638-
for(int i = 0; i < o.size(); i++)
689+
for (int i = 0; i < o.size(); i++) {
639690
o[i] = R::rwilcox(a, b);
640-
691+
}
641692
return o;
642693
}
694+
695+
// [[Rcpp::export]]
696+
NumericVector runit_rwilcox_sugar(double a, double b) {
697+
return Rcpp::rwilcox(5, a, b);
698+
}

0 commit comments

Comments
 (0)