[Distr-commits] r348 - in pkg: distrEx/R distrMod/R distrTEst/R distrTeach/R

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

Author: ruckdeschel
Date: 2008-11-24 19:28:27 +0100 (Mon, 24 Nov 2008)
New Revision: 348

Modified:
   pkg/distrEx/R/KolmogorovDist.R
   pkg/distrMod/R/AllPlot.R
   pkg/distrTEst/R/plot-methods.R
   pkg/distrTeach/R/illustCLT.R
Log:
correction of some buglets...

Modified: pkg/distrEx/R/KolmogorovDist.R
===================================================================
--- pkg/distrEx/R/KolmogorovDist.R	2008-11-24 16:17:40 UTC (rev 347)
+++ pkg/distrEx/R/KolmogorovDist.R	2008-11-24 18:28:27 UTC (rev 348)
@@ -58,14 +58,15 @@
                                 q(e2)(1-TruncQuantile)), 
                          q(e2)(1))
 
-        owarn <- getOption("warn"); options(warn = -1)
+        o.warn <- getOption("warn"); options(warn = -1)
+        on.exit(options(o.warn))
         x1 <- union(support(e1), r(e2)(1e5))
         x2 <- seq(from=lower, to=upper, length=1e5)
         x <- union(x1, x2) 
 
         res <- max(abs(p(e1)(x)-p(e2)(x)))
         names(res) <- "Kolmogorov distance"
-        options(warn = owarn)
+        options(warn = o.warn)
 
         return(res)
     })

Modified: pkg/distrMod/R/AllPlot.R
===================================================================
--- pkg/distrMod/R/AllPlot.R	2008-11-24 16:17:40 UTC (rev 347)
+++ pkg/distrMod/R/AllPlot.R	2008-11-24 18:28:27 UTC (rev 348)
@@ -130,7 +130,7 @@
      
         o.warn <- options("warn")
         options(warn = -1)
-        on.exit(options(warn=o.warn))
+        on.exit(options(o.warn))
         opar <- par()
         on.exit(par(opar))
         if (!withSweave)

Modified: pkg/distrTEst/R/plot-methods.R
===================================================================
--- pkg/distrTEst/R/plot-methods.R	2008-11-24 16:17:40 UTC (rev 347)
+++ pkg/distrTEst/R/plot-methods.R	2008-11-24 18:28:27 UTC (rev 348)
@@ -113,7 +113,7 @@
            ylim0[,1:(c2*c1)] <- ylim1
         if(c3>0)
            ylim0[,c2*c1+(1:c3)] <- ylim1[,1:c3]
-        options("warn" = oldwarn) }
+        options("warn" = o.warn) }
 
   op <- par()
   on.exit(par(op))

Modified: pkg/distrTeach/R/illustCLT.R
===================================================================
--- pkg/distrTeach/R/illustCLT.R	2008-11-24 16:17:40 UTC (rev 347)
+++ pkg/distrTeach/R/illustCLT.R	2008-11-24 18:28:27 UTC (rev 348)
@@ -9,7 +9,7 @@
             o.warn <- getOption("warn"); options(warn = -1)
             on.exit(options(o.warn))
             Sn <- Sn + Distr
-            options(warn = owarn)
+            options(warn = o.warn)
             Tn <- make01(Sn)
             plotCLT(Tn,k, summands = Distrname)
             Sys.sleep(sleep)