[Distr-commits] r969 - in branches/distr-2.6/pkg/distrMod: R man

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

Author: ruckdeschel
Date: 2014-10-05 23:06:31 +0200 (Sun, 05 Oct 2014)
New Revision: 969

Modified:
   branches/distr-2.6/pkg/distrMod/R/qqplot.R
   branches/distr-2.6/pkg/distrMod/R/returnlevelplot.R
   branches/distr-2.6/pkg/distrMod/man/qqplot.Rd
Log:
distrMod: qqplot now by default has datax = TRUE;
          some minor changes in returnlevelplot

Modified: branches/distr-2.6/pkg/distrMod/R/qqplot.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/qqplot.R	2014-10-05 21:04:03 UTC (rev 968)
+++ branches/distr-2.6/pkg/distrMod/R/qqplot.R	2014-10-05 21:06:31 UTC (rev 969)
@@ -42,7 +42,7 @@
              withConf.pw  = withConf,   ### shall pointwise confidence lines be plotted
              withConf.sim = withConf,   ### shall simultaneous confidence lines be plotted
              plot.it = TRUE,    ### shall be plotted at all (inherited from stats::qqplot)
-             datax = FALSE,     ### as in qqnorm
+             datax = TRUE,     ### as in qqnorm
              xlab = deparse(substitute(x)), ## x-label
              ylab = deparse(substitute(y)), ## y-label
              ...,                 ## further parameters

Modified: branches/distr-2.6/pkg/distrMod/R/returnlevelplot.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/returnlevelplot.R	2014-10-05 21:04:03 UTC (rev 968)
+++ branches/distr-2.6/pkg/distrMod/R/returnlevelplot.R	2014-10-05 21:06:31 UTC (rev 969)
@@ -75,6 +75,7 @@
     if(missing(ylab)) mc$ylab <- gettext("Return period (years)")
     if(missing(main)) mc$main <- gettext("Return level plot")
     mcl <- as.list(mc)[-1]
+    mcl$datax <- NULL
     mcl$MaxOrPOT <- NULL
     mcl$npy <- NULL
     mcl$withSweave <- NULL
@@ -110,7 +111,7 @@
     rxyall  <- (max(xyall)-min(xyall))*0.6
     rxymean <- (max(xyall)+min(xyall))/2
 
-    xyallc  <- seq(from=rxymean-rxyall,to=rxymean+rxyall, length.out=300)
+    xyallc  <- seq(from=rxymean-rxyall,to=rxymean+rxyall, length.out=400)
 #    print(xyallc)
     pxyall  <- p(y)(xyallc)
 #    print(pxyall)

Modified: branches/distr-2.6/pkg/distrMod/man/qqplot.Rd
===================================================================
--- branches/distr-2.6/pkg/distrMod/man/qqplot.Rd	2014-10-05 21:04:03 UTC (rev 968)
+++ branches/distr-2.6/pkg/distrMod/man/qqplot.Rd	2014-10-05 21:06:31 UTC (rev 969)
@@ -6,7 +6,7 @@
 \S4method{qqplot}{ANY,UnivariateDistribution}(x,y,
     n = length(x), withIdLine = TRUE,
     withConf = TRUE, withConf.pw  = withConf, withConf.sim = withConf,
-    plot.it = TRUE, datax = FALSE, xlab = deparse(substitute(x)),
+    plot.it = TRUE, datax = TRUE, xlab = deparse(substitute(x)),
     ylab = deparse(substitute(y)),
     ..., width = 10, height = 5.5, withSweave = getdistrOption("withSweave"),
     mfColRow = TRUE, n.CI = n, withLab = FALSE, lab.pts = NULL, which.lbs = NULL,