[Distr-commits] r586 - branches/distr-2.2/pkg

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

Author: ruckdeschel
Date: 2009-09-10 21:21:05 +0200 (Thu, 10 Sep 2009)
New Revision: 586

Modified:
   branches/distr-2.2/pkg/qqplot.R
Log:
fading now only done when necessary

Modified: branches/distr-2.2/pkg/qqplot.R
===================================================================
--- branches/distr-2.2/pkg/qqplot.R	2009-09-10 18:59:06 UTC (rev 585)
+++ branches/distr-2.2/pkg/qqplot.R	2009-09-10 19:21:05 UTC (rev 586)
@@ -514,25 +514,24 @@
        stop("IC of the kStepEstimator needs to be of class 'IC'")
     
     L2Fam <- eval(IC at CallL2Fam)
-    wx <- 1
 
+    mcl$y <- L2Fam
+
     if(is(IC,"HampIC")){
       w.fct <- weight(weight(IC))
       wx <- w.fct(x)
       mcl$order.traf <- function(x) 1/w.fct(x)
-    }
-    
-    mcl$y <- L2Fam
 
-    cex.lbl <- if(is.null(mcl$cex.lbl))  par("cex")  else eval(mcl$cex.lbl)
-    cex.pch <- if(is.null(mcl$cex.pch))  par("cex")  else eval(mcl$cex.pch)
-    mcl$cex.lbl <- cex.lbl*wx^exp.cex2.lbl
-    mcl$cex.pch <- cex.pch*wx^exp.cex2.pch
+      cex.lbl <- if(is.null(mcl$cex.lbl))  par("cex")  else eval(mcl$cex.lbl)
+      cex.pch <- if(is.null(mcl$cex.pch))  par("cex")  else eval(mcl$cex.pch)
+      mcl$cex.lbl <- cex.lbl*wx^exp.cex2.lbl
+      mcl$cex.pch <- cex.pch*wx^exp.cex2.pch
 
-    col.lbl <- if(is.null(mcl$col.lbl))  par("col")  else eval(mcl$col.lbl)
-    col.pch <- if(is.null(mcl$col.pch))  par("col")  else eval(mcl$col.pch)
-    mcl$col.lbl <- .fadeColor(col.lbl,wx^exp.fadcol.lbl)
-    mcl$col.pch <- .fadeColor(col.pch,wx^exp.fadcol.pch)
+      col.lbl <- if(is.null(mcl$col.lbl))  par("col")  else eval(mcl$col.lbl)
+      col.pch <- if(is.null(mcl$col.pch))  par("col")  else eval(mcl$col.pch)
+      mcl$col.lbl <- .fadeColor(col.lbl,wx^exp.fadcol.lbl)
+      mcl$col.pch <- .fadeColor(col.pch,wx^exp.fadcol.pch)
+    }
 
     return(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
             args=mcl))