[Robast-commits] r781 - branches/robast-1.0/pkg/RobAStBase/R

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

Author: ruckdeschel
Date: 2014-08-10 19:58:50 +0200 (Sun, 10 Aug 2014)
New Revision: 781

Modified:
   branches/robast-1.0/pkg/RobAStBase/R/qqplot.R
Log:
[RobAStBase] qqplot: output is filtered by invisible(); in addition, in the method for kStepEstimate,
   the parametric family is shifted to the return value of the parameter estimate before plotting

Modified: branches/robast-1.0/pkg/RobAStBase/R/qqplot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/qqplot.R	2014-08-10 17:55:08 UTC (rev 780)
+++ branches/robast-1.0/pkg/RobAStBase/R/qqplot.R	2014-08-10 17:58:50 UTC (rev 781)
@@ -48,8 +48,8 @@
     x.cex <- 3/(1+log(1+xD))
     mcl$cex.pch <- x.cex
 
-    return(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
-            args=mcl))
+    return(invisible(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
+            args=mcl)))
     })
 
 
@@ -101,8 +101,8 @@
 
     mcl$cex.pch <- x.cex
 
-    return(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
-            args=mcl))
+    return(invisible(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
+            args=mcl)))
     })
 
 ## into RobAStBase
@@ -129,9 +129,11 @@
        stop("IC of the kStepEstimator needs to be of class 'IC'")
 
     L2Fam <- eval(IC at CallL2Fam)
+    param <- ParamFamParameter(main=untransformed.estimate(y), nuisance=nuisance(y),
+                               fixed=fixed(y))
+    L2Fam0 <- modifyModel(L2Fam,param)
+    mcl$y <- L2Fam0
 
-    mcl$y <- L2Fam
-
     if(is(IC,"HampIC")){
       dim0 <- nrow(FisherInfo(L2Fam))
       L <- as(diag(dim0)%*%L2Fam at L2deriv, "EuclRandVariable")
@@ -154,6 +156,6 @@
       mcl$col.pch <- .fadeColor(col.pch,wx^exp.fadcol.pch, bg = bg)
     }
 
-    return(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
-            args=mcl))
+    return(invisible(do.call(getMethod("qqplot", signature(x="ANY", y="ProbFamily")),
+            args=mcl)))
     })