[Distr-commits] r974 - branches/distr-2.6/pkg/distrMod/R

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

Author: ruckdeschel
Date: 2014-10-21 19:52:37 +0200 (Tue, 21 Oct 2014)
New Revision: 974

Modified:
   branches/distr-2.6/pkg/distrMod/R/0distrModUtils.R
   branches/distr-2.6/pkg/distrMod/R/qqplot.R
Log:
[distrMod] argh; the issue with qqplot and datax had persisted; it is fixed now.

Modified: branches/distr-2.6/pkg/distrMod/R/0distrModUtils.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/0distrModUtils.R	2014-10-21 16:42:04 UTC (rev 973)
+++ branches/distr-2.6/pkg/distrMod/R/0distrModUtils.R	2014-10-21 17:52:37 UTC (rev 974)
@@ -578,7 +578,7 @@
 }
 
 .deleteItemsMCL <- function(mcl){
-    mcl$n <- NULL
+    mcl$datax <- mcl$n <- NULL
     mcl$col.IdL <- mcl$alpha.CI <- mcl$lty.IdL <-  NULL
     mcl$col.NotInSupport <- mcl$check.NotInSupport <- NULL
     mcl$exact.sCI <- mcl$exact.pCI <- NULL
@@ -596,6 +596,11 @@
     mcl$legend.cex <- mcl$with.legend <- mcl$legend.bg <- NULL
     mcl$legend.pos <- mcl$legend.pref <- mcl$legend.postf <- NULL
     mcl$legend.alpha <- NULL
+    mcl$withSweave <- NULL
+    mcl$mfColRow <- NULL
+    mcl$debug <- NULL
+    mcl$added.points.CI <- NULL
+
 mcl}
 
 ## helpers

Modified: branches/distr-2.6/pkg/distrMod/R/qqplot.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/qqplot.R	2014-10-21 16:42:04 UTC (rev 973)
+++ branches/distr-2.6/pkg/distrMod/R/qqplot.R	2014-10-21 17:52:37 UTC (rev 974)
@@ -98,13 +98,9 @@
     if(missing(xlab)){ xlab <- mc$xlab <- as.character(deparse(mc$x))}
     if(missing(ylab)){ ylab <- mc$ylab <- as.character(deparse(mc$y))}
     mcl <- as.list(mc)[-1]
-    mcl$withSweave <- NULL
-    mcl$mfColRow <- NULL
-    mcl$debug <- NULL
-    mcl$added.points.CI <- NULL
     force(x)
     if(is.null(mcl$datax)) datax <- FALSE
-    if(!datax){ mc$ylab <- xlab; mc$xlab <- ylab}
+    if(!datax){ mcl$ylab <- xlab; mcl$xlab <- ylab}
 
     xj <- x
     if(any(.isReplicated(x)))
@@ -154,8 +150,13 @@
 
     if(n!=length(x)) withLab <- FALSE
 
-    mcl$x <- xj
-    mcl$y <- yc
+    if(datax){ 
+      mcl$x <- xj
+      mcl$y <- yc
+    }else{
+      mcl$y <- xj
+      mcl$x <- yc
+    }
     mcl <- .deleteItemsMCL(mcl)
     mcl$cex <- cex.pch
     mcl$col <- col.pch