[Distr-commits] r706 - in pkg/distr: R tests/Examples

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

Author: stamats
Date: 2011-01-05 10:59:00 +0100 (Wed, 05 Jan 2011)
New Revision: 706

Modified:
   pkg/distr/R/internalUtils.R
   pkg/distr/tests/Examples/distr-Ex.Rout.save
Log:
extended warning message in .makeDNew - as .makeDNew is not exported

Modified: pkg/distr/R/internalUtils.R
===================================================================
--- pkg/distr/R/internalUtils.R	2011-01-05 08:55:05 UTC (rev 705)
+++ pkg/distr/R/internalUtils.R	2011-01-05 09:59:00 UTC (rev 706)
@@ -666,7 +666,7 @@
                     xM <- max(0.95*x,1.05*x)
                     stand <- try(integrate(df1, xm, xM)$value, TRUE)
                     if (is(stand,"try-error")){
-                        warning("'integrate()' threw an error ---result may be inaccurate.")
+                        warning("'integrate()' threw an error ---hence a simpler approximation was used for standardizing the density which may be inaccurate; see 'distr:::.makeDNew'.")
                         stand <- sum(df1(x))*h*(x[2]-x[1])
                     }
                 }

Modified: pkg/distr/tests/Examples/distr-Ex.Rout.save
===================================================================
--- pkg/distr/tests/Examples/distr-Ex.Rout.save	2011-01-05 08:55:05 UTC (rev 705)
+++ pkg/distr/tests/Examples/distr-Ex.Rout.save	2011-01-05 09:59:00 UTC (rev 706)
@@ -1,5 +1,5 @@
 
-R version 2.12.1 Patched (2011-01-03 r53910)
+R version 2.12.1 Patched (2011-01-04 r53913)
 Copyright (C) 2011 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 Platform: x86_64-unknown-linux-gnu (64-bit)
@@ -101,7 +101,7 @@
 > Y <- Pois(lambda = 3)
 > Z <- X+Y  # generates Law of corresponding independent variables
 Warning in .makeDNew(x, dpn, h = 1, standM = "int") :
-  'integrate()' threw an error ---result may be inaccurate.
+  'integrate()' threw an error ---hence a simpler approximation was used for standardizing the density which may be inaccurate; see 'distr:::.makeDNew'.
 > p(Z)(0.2)
 [1] 0
 > r(Z)(1000)
@@ -2015,7 +2015,7 @@
     else d0 <- df1(x)/stand
     return(d0)
 }
-<environment: 0x38037a0>
+<environment: 0x4638830>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2036,7 +2036,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x3613b50>
+<environment: 0x5f318c8>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2054,7 +2054,7 @@
     else q.l(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x49fad40>
+<environment: 0x5206de8>
 
 > 
 > rp2 <- function(n){rpois(n, lambda = 1)^2}
@@ -2094,7 +2094,7 @@
     else d0 <- df1(x)/stand
     return(d0)
 }
-<environment: 0x3582cc8>
+<environment: 0x5ce2990>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2115,7 +2115,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x537ad98>
+<environment: 0x59ccca8>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2133,7 +2133,7 @@
     else q.l(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x49f5ce8>
+<environment: 0x503b630>
 
 > 
 > rp2 <- function(n){rpois(n, lambda = 1)^2}
@@ -3862,7 +3862,7 @@
 > F <- ( Norm() + Binom() + Pois() + Exp() ) * 2 - 10
 > system.time(r(F)(10^6))
    user  system elapsed 
-  0.750   0.040   0.783 
+  0.750   0.020   0.768 
 > simplifyr(F, size = 10^6)
 > system.time(r(F)(10^6))
    user  system elapsed 
@@ -3900,7 +3900,7 @@
 > ### * <FOOTER>
 > ###
 > cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  144.17 0.28 144.939 0 0 
+Time elapsed:  149.19 0.26 149.969 0 0 
 > grDevices::dev.off()
 postscript 
          2