[Robast-commits] r535 - in branches/robast-0.9/pkg/ROptEst: R man

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

Author: ruckdeschel
Date: 2013-01-15 02:03:44 +0100 (Tue, 15 Jan 2013)
New Revision: 535

Modified:
   branches/robast-0.9/pkg/ROptEst/R/AllPlot.R
   branches/robast-0.9/pkg/ROptEst/R/comparePlot.R
   branches/robast-0.9/pkg/ROptEst/man/comparePlot.Rd
Log:
ROptEst: fixed yet another buglet

Modified: branches/robast-0.9/pkg/ROptEst/R/AllPlot.R
===================================================================
--- branches/robast-0.9/pkg/ROptEst/R/AllPlot.R	2013-01-15 00:45:04 UTC (rev 534)
+++ branches/robast-0.9/pkg/ROptEst/R/AllPlot.R	2013-01-15 01:03:44 UTC (rev 535)
@@ -16,6 +16,9 @@
 
         L2Fam <- eval(x at CallL2Fam); trafO <- trafo(L2Fam at param)
         dims  <- nrow(trafO); to.draw <- 1:dims
+        dimnms  <- c(rownames(trafO))
+        if(is.null(dimnms))
+           dimnms <- paste("dim",1:dims,sep="")
         if(! is.null(to.draw.arg)){
             if(is.character(to.draw.arg))
                  to.draw <- pmatch(to.draw.arg, dimnms)

Modified: branches/robast-0.9/pkg/ROptEst/R/comparePlot.R
===================================================================
--- branches/robast-0.9/pkg/ROptEst/R/comparePlot.R	2013-01-15 00:45:04 UTC (rev 534)
+++ branches/robast-0.9/pkg/ROptEst/R/comparePlot.R	2013-01-15 01:03:44 UTC (rev 535)
@@ -8,7 +8,7 @@
              with.legend = FALSE, legend = NULL, legend.bg = "white",
              legend.location = "bottomright", legend.cex = 0.8,
              withMBR = FALSE, MBRB = NA, MBR.fac = 2, col.MBR = par("col"),
-             lty.MBR = "dashed", lwd.MBR = 0.8,
+             lty.MBR = "dashed", lwd.MBR = 0.8,  n.MBR = 10000,
              scaleX = FALSE, scaleX.fct, scaleX.inv,
              scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm,
              scaleN = 9, x.ticks = NULL, y.ticks = NULL,
@@ -22,6 +22,9 @@
 
         L2Fam <- eval(obj1 at CallL2Fam); trafO <- trafo(L2Fam at param)
         dims  <- nrow(trafO); to.draw <- 1:dims
+        dimnms  <- c(rownames(trafO))
+        if(is.null(dimnms))
+           dimnms <- paste("dim",1:dims,sep="")
         if(! is.null(to.draw.arg)){
             if(is.character(to.draw.arg))
                  to.draw <- pmatch(to.draw.arg, dimnms)
@@ -36,7 +39,8 @@
                              ContNeighborhood(radius = 0.5))
            ICmbr <- try(optIC(model = robModel, risk = asBias()), silent=TRUE)
            if(!is(ICmbr,"try-error"))
-              MBRB <- .getExtremeCoordIC(ICmbr, distribution(L2Fam), to.draw)
+              MBRB <- .getExtremeCoordIC(ICmbr, distribution(L2Fam), to.draw,
+                                         n=n.MBR)
            else withMBR <- FALSE
         }
         mcl$MBRB <- MBRB

Modified: branches/robast-0.9/pkg/ROptEst/man/comparePlot.Rd
===================================================================
--- branches/robast-0.9/pkg/ROptEst/man/comparePlot.Rd	2013-01-15 00:45:04 UTC (rev 534)
+++ branches/robast-0.9/pkg/ROptEst/man/comparePlot.Rd	2013-01-15 01:03:44 UTC (rev 535)
@@ -12,7 +12,9 @@
 S4-Method \code{comparePlot} for signature \code{IC,IC} has been enhanced compared to
 its original definition in \pkg{RobAStBase} so that if
 argument \code{MBRB} is \code{NA}, it is filled automatically by a call
-to \code{optIC} which computes the MBR-IC on the fly.
+to \code{optIC} which computes the MBR-IC on the fly. To this end, there
+is an additional argument \code{n.MBR} defaulting to 10000
+to determine the number of evaluation points.
 }
 \examples{
 if(require(ROptEst)){