[Distr-commits] r603 - in branches/distr-2.2/pkg/distr: R inst/doc

Thu Oct 8 15:33:56 CEST 2009

Author: ruckdeschel
Date: 2009-10-08 15:33:56 +0200 (Thu, 08 Oct 2009)
New Revision: 603

Modified:
   branches/distr-2.2/pkg/distr/R/AllGenerics.R
   branches/distr-2.2/pkg/distr/R/internalUtils.R
   branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
Log:
 all in distr: 
+ modified generic declaration of qqplot
+ modified return value of qqplot-ANY,ANY,method
+ nailed down the culprit ...
  recently tried to fix a spuriously occurring error on check:
  example to simplifyD-methods would produce the following error

> Mix1 <- UnivarMixingDistribution(Norm(),Binom(2,.3),
>+   UnivarLebDecDistribution(acPart = Chisq(df = 2), discretePart = Nbinom(3,.09),
>+                            acWeight = 0.3),
>+   Norm()-Chisq(df=3), mixCoeff=c(0,0,0.2,0.8), withSimplify = FALSE)
>Error in f1(x) : approx(): attempted to interpolate NA values
>Calls: UnivarMixingDistribution ... lapply -> FUN -> do.call -> <Anonymous> -> q.l -> f1 -> .C
>Execution halted

now the error occurred again; identified the last few calls in the last call 
chain above to be in .makeQNew and modified it to be able to work with NAs 
(still don't know why/where these NA's got into...)




Modified: branches/distr-2.2/pkg/distr/R/AllGenerics.R
===================================================================

--- branches/distr-2.2/pkg/distr/R/AllGenerics.R	2009-10-06 13:04:28 UTC (rev 602)
+++ branches/distr-2.2/pkg/distr/R/AllGenerics.R	2009-10-08 13:33:56 UTC (rev 603)
@@ -60,7 +60,7 @@
 
 ## masking function qqplot
 
-if(!isGeneric("qqplot"))
+#if(!isGeneric("qqplot"))
     setGeneric("qqplot", function(x, y, ...) standardGeneric("qqplot"))
 
 setMethod("qqplot", signature(x="ANY",y="ANY"), function(x, y,
@@ -70,8 +70,7 @@
     if(missing(xlab)) mc$xlab <- xlab
     if(missing(ylab)) mc$ylab <- ylab
     mcl <- as.list(mc)[-1]
-    do.call(stats::qqplot, args=mcl)
-    return(invisible())
+    return(invisible(do.call(stats::qqplot, args=mcl)))
     })
 
 ### ---------------------------

Modified: branches/distr-2.2/pkg/distr/R/internalUtils.R
===================================================================
--- branches/distr-2.2/pkg/distr/R/internalUtils.R	2009-10-06 13:04:28 UTC (rev 602)
+++ branches/distr-2.2/pkg/distr/R/internalUtils.R	2009-10-08 13:33:56 UTC (rev 603)
@@ -612,6 +612,10 @@
 #x0 <- x00[idx]               ### maximal x's
 #y0 <- y00[idx]
 #f1 <- approxfun(x = x0, y = y0, yleft = y0[1], yright = y0[length(y0)])
+isna <- is.na(x)|is.na(y)
+x <- x[!isna]
+y <- y[!isna]
+
 l0 <- length(unique(x[!.isEqual01(x)]))
 if(l0 > 1){
    yl <- if(is.finite(yleft)) yleft  else y[1]

Modified: branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf	2009-10-06 13:04:28 UTC (rev 602)
+++ branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf	2009-10-08 13:33:56 UTC (rev 603)
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20091006145810)
-/ModDate (D:20091006145810)
+/CreationDate (D:20091008152839)
+/ModDate (D:20091008152839)
 /Title (R Graphics Output)
 /Producer (R 2.10.0)
 /Creator (R)
@@ -351,7 +351,7 @@
 72.83 127.42 l
 72.93 128.67 l
 73.03 129.93 l
-73.13 131.21 l
+73.13 131.22 l
 73.23 132.51 l
 73.34 133.83 l
 73.44 135.17 l
@@ -359,7 +359,7 @@
 73.64 137.89 l
 73.74 139.28 l
 73.84 140.68 l
-73.94 142.11 l
+73.94 142.10 l
 74.04 143.55 l
 74.14 145.01 l
 74.25 146.48 l
@@ -375,18 +375,18 @@
 75.26 162.23 l
 75.36 163.91 l
 75.46 165.60 l
-75.56 167.30 l
+75.56 167.31 l
 75.66 169.03 l
 75.76 170.77 l
 75.86 172.53 l
 75.96 174.31 l
 76.06 176.11 l
 76.17 177.92 l
-76.27 179.74 l
+76.27 179.75 l
 76.37 181.59 l
 76.47 183.45 l
 76.57 185.33 l
-76.67 187.23 l
+76.67 187.22 l
 76.77 189.14 l
 76.87 191.06 l
 76.97 193.01 l
@@ -401,20 +401,20 @@
 77.88 211.18 l
 77.99 213.27 l
 78.09 215.38 l
-78.19 217.49 l
+78.19 217.50 l
 78.29 219.63 l
 78.39 221.77 l
 78.49 223.93 l
 78.59 226.10 l
 78.69 228.28 l
-78.79 230.47 l
+78.79 230.48 l
 78.90 232.68 l
 79.00 234.90 l
 79.10 237.12 l
 79.20 239.36 l
 79.30 241.61 l
 79.40 243.87 l
-79.50 246.14 l
+79.50 246.13 l
 79.60 248.41 l
 79.70 250.70 l
 79.81 252.99 l
@@ -423,15 +423,15 @@
 80.11 259.92 l
 80.21 262.24 l
 80.31 264.57 l
-80.41 266.91 l
-80.51 269.25 l
+80.41 266.90 l
+80.51 269.24 l
 80.61 271.59 l
 80.72 273.94 l
 80.82 276.30 l
 80.92 278.66 l
 81.02 281.02 l
 81.12 283.39 l
-81.22 285.75 l
+81.22 285.76 l
 81.32 288.13 l
 81.42 290.50 l
 81.52 292.87 l
@@ -453,7 +453,7 @@
 83.14 330.60 l
 83.24 332.92 l
 83.34 335.23 l
-83.44 337.53 l
+83.44 337.52 l
 83.55 339.82 l
 83.65 342.10 l
 83.75 344.37 l
@@ -473,7 +473,7 @@
 85.16 374.78 l
 85.26 376.84 l
 85.37 378.87 l
-85.47 380.88 l
+85.47 380.89 l
 85.57 382.88 l
 85.67 384.85 l
 85.77 386.81 l
@@ -482,10 +482,10 @@
 86.07 392.53 l
 86.17 394.40 l
 86.28 396.24 l
-86.38 398.06 l
+86.38 398.05 l
 86.48 399.85 l
 86.58 401.61 l
-86.68 403.35 l
+86.68 403.36 l
 86.78 405.07 l
 86.88 406.76 l
 86.98 408.42 l
@@ -573,17 +573,17 @@
 95.27 427.34 l
 95.37 426.08 l
 95.48 424.79 l
-95.58 423.47 l
+95.58 423.46 l
 95.68 422.11 l
 95.78 420.73 l
 95.88 419.32 l
 95.98 417.88 l
 96.08 416.41 l
-96.18 414.91 l
+96.18 414.92 l
 96.28 413.39 l
 96.39 411.84 l
 96.49 410.26 l
-96.59 408.66 l
+96.59 408.65 l
 96.69 407.02 l
 96.79 405.37 l
 96.89 403.69 l
@@ -661,23 +661,23 @@
 104.17 249.11 l
 104.27 246.93 l
 104.37 244.75 l
-104.47 242.59 l
+104.47 242.58 l
 104.57 240.43 l
 104.68 238.28 l
 104.78 236.15 l
 104.88 234.02 l
 104.98 231.90 l
 105.08 229.80 l
-105.18 227.70 l
-105.28 225.63 l
-105.38 223.55 l
+105.18 227.71 l
+105.28 225.62 l
+105.38 223.56 l
 105.48 221.50 l
 105.59 219.45 l
 105.69 217.42 l
 105.79 215.40 l
 105.89 213.39 l
 105.99 211.40 l
-106.09 209.42 l
+106.09 209.41 l
 106.19 207.45 l
 106.29 205.49 l
 106.39 203.55 l
@@ -724,7 +724,7 @@
 110.54 137.28 l
 110.64 136.00 l
 110.74 134.74 l
-110.84 133.50 l
+110.84 133.49 l
 110.94 132.26 l
 111.04 131.05 l
 111.15 129.85 l
@@ -734,7 +734,7 @@
 111.55 125.21 l
 111.65 124.09 l
 111.75 122.99 l
-111.85 121.89 l
+111.85 121.90 l
 111.95 120.82 l
 112.06 119.76 l
 112.16 118.71 l
@@ -756,7 +756,7 @@
 113.77 103.94 l
 113.87 103.13 l
 113.98 102.34 l
-114.08 101.55 l
+114.08 101.56 l
 114.18 100.79 l
 114.28 100.03 l
 114.38 99.29 l

