[Rcpp-commits] r1949 - pkg/Rcpp/inst/unitTests

[noreply at r-forge.r-project.org]

Author: dmbates
Date: 2010-08-06 19:03:35 +0200 (Fri, 06 Aug 2010)
New Revision: 1949

Modified:
   pkg/Rcpp/inst/unitTests/runit.stats.R
Log:
Corrected instances of numeric arguments passed as integers, deleted tests for binomial with fixed parameter values.


Modified: pkg/Rcpp/inst/unitTests/runit.stats.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.stats.R	2010-08-06 14:47:11 UTC (rev 1948)
+++ pkg/Rcpp/inst/unitTests/runit.stats.R	2010-08-06 17:03:35 UTC (rev 1949)
@@ -44,7 +44,7 @@
 
 				  ,
 				  "runit_dunif" = list(
-				  signature( x = "integer" ),
+				  signature( x = "numeric" ),
 				  '
 				  NumericVector xx(x) ;
 				  return List::create(_["NoLog"] = stats::dunif( xx, 0, 1),
@@ -52,7 +52,7 @@
 				  ')
 
 				  ,
-				  "runit_dgamma" = list( signature( x = "integer" ),
+				  "runit_dgamma" = list( signature( x = "numeric" ),
 				  '
 				  NumericVector xx(x) ;
 				  return List::create(_["NoLog"] = stats::dgamma( xx, 1.0, 1.0),
@@ -88,8 +88,7 @@
 
 				  ,
 				  "runit_pbeta" = list(
-				  signature(x = "numeric",
-							a = "numeric", b = "numeric"),
+				  signature(x = "numeric", a = "numeric", b = "numeric"),
 				  '
 				  double aa = as<double>(a), bb = as<double>(b) ;
 				  NumericVector xx(x) ;
@@ -113,18 +112,6 @@
 				  ')
 
 				  ,
-				  ## Using fixed values of n and p
-				  "runit_pbinom_fixed" = list(
-				  signature( x = "numeric" ),
-				  '
-				  NumericVector xx(x) ;
-				  return List::create(_["lowerNoLog"] = stats::pbinom(xx, 20, 0.5 ),
-									  _["lowerLog"]	  = stats::pbinom(xx, 20, 0.5, true, true ),
-									  _["upperNoLog"] = stats::pbinom(xx, 20, 0.5, false ),
-									  _["upperLog"]	  = stats::pbinom(xx, 20, 0.5, false, true ));
-				  ')
-
-				  ,
 				  "runit_punif" = list(
 				  signature( x = "numeric" ),
 				  '
@@ -189,17 +176,6 @@
 				  ')
 
 				  ,
-				  ## Using fixed values of n and p
-				  "runit_qbinom_prob_fixed" = list(
-				  signature( x = "numeric" ),
-				  '
-				  NumericVector xx(x) ;
-				  return List::create(_["lower"] = stats::qbinom( xx, 20, 0.5 ),
-									  _["upper"] = stats::qbinom( xx, 20, 0.5, false));
-				  '
-				  )
-
-				  ,
 				  "runit_qunif_prob" = list(
 				  signature( x = "numeric" ),
 				  '
@@ -240,10 +216,10 @@
 
                   ,
                   "runit_qt" = list(
-                  signature( x = "numeric", df = "integer", lower = "logical", log = "logical" ),
+                  signature( x = "numeric", df = "numeric", lower = "logical", log = "logical" ),
                   '
 				  NumericVector xx(x);
-                  int d = as<int>(df);
+                  double d = as<double>(df);
                   bool lt = as<bool>(lower);
                   bool lg = as<bool>(log);
 			      return wrap(stats::qt( xx, d, lt, lg));
@@ -352,18 +328,6 @@
                 msg = " stats.pbinom")
 }
 
-test.stats.pbinom.fixed <- function( ) {
-    fx <- .rcpp.stats$runit_pbinom_fixed
-    vv <- 0:20
-    checkEquals(fx(vv),
-                list(lowerNoLog = pbinom(vv, 20, 0.5),
-                     lowerLog   = pbinom(vv, 20, 0.5, log=TRUE),
-                     upperNoLog = pbinom(vv, 20, 0.5, lower=FALSE),
-                     upperLog   = pbinom(vv, 20, 0.5, lower=FALSE, log=TRUE)
-                     ),
-                msg = " stats.pbinom.fixed")
-}
-
 test.stats.punif <- function( ) {
     fx <- .rcpp.stats$runit_punif
     v <- qunif(seq(0.0, 1.0, by=0.1))
@@ -442,16 +406,6 @@
                 msg = " stats.qbinom")
 }
 
-test.stats.qbinom.fixed <- function( ) {
-    fx <- .rcpp.stats$runit_qbinom_prob_fixed
-    vv <- seq(0, 1, by = 0.1)
-    checkEquals(fx(vv),
-                list(lower = qbinom(vv, 20, 0.5),
-                     upper = qbinom(vv, 20, 0.5, lower=FALSE)
-                     ),
-                msg = " stats.qbinom.fixed")
-}
-
 test.stats.qunif <- function( ) {
     fx <- .rcpp.stats$runit_qunif_prob
     checkEquals(fx(c(0, 1, 1.1, -.1)),