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

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

Author: ruckdeschel
Date: 2013-01-25 16:13:29 +0100 (Fri, 25 Jan 2013)
New Revision: 563

Modified:
   branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R
   branches/robast-0.9/pkg/ROptEst/man/internals.Rd
Log:
ROptEst fixed two bugs (for radius 0) in 
"getInfRobIC", signature(L2deriv = "RealRandVariable", risk = "asGRisk",neighbor = "UncondNeighborhood")

Modified: branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R
===================================================================
--- branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R	2013-01-25 14:14:56 UTC (rev 562)
+++ branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R	2013-01-25 15:13:29 UTC (rev 563)
@@ -232,11 +232,11 @@
 
         ## sort out upper solution if radius = 0
         if(identical(all.equal(radius, 0), TRUE))
-           return(.getUpperSol(L2deriv = L2deriv, b = b, radius = radius,
+           return(.getUpperSol(L2deriv = L2deriv, radius = radius,
                                risk = risk, neighbor = neighbor,
                                biastype = biastype, normtype = normtype,
                                Distr = Distr, Finfo = Finfo, trafo = trafo,
-                               QF = std, verbose = verbose, warn = warn))
+                               QuadForm = std, verbose = verbose, warn = warn))
 
         ## determine which entries must be computed
         # by default everything
@@ -486,7 +486,7 @@
 
 
 ### helper function to return the upper case solution if r=0
-.getUpperSol <- function(L2deriv, b, radius, risk, neighbor, biastype,
+.getUpperSol <- function(L2deriv, radius, risk, neighbor, biastype,
                        normtype, Distr, Finfo, trafo,
                        QuadForm, verbose, warn){
 
@@ -495,6 +495,7 @@
             res <- getInfRobIC(L2deriv = L2deriv, risk = asCov(), neighbor = neighbor,
                                Distr = Distr, Finfo = Finfo, trafo = trafo,
                                QuadForm = QuadForm, verbose = verbose)
+            b <- res$b
             res <- c(res, list(biastype = biastype, normtype = normtype))
             if(!is(risk, "asMSE")){
                     FI <- trafo%*%solve(Finfo)%*%t(trafo)

Modified: branches/robast-0.9/pkg/ROptEst/man/internals.Rd
===================================================================
--- branches/robast-0.9/pkg/ROptEst/man/internals.Rd	2013-01-25 14:14:56 UTC (rev 562)
+++ branches/robast-0.9/pkg/ROptEst/man/internals.Rd	2013-01-25 15:13:29 UTC (rev 563)
@@ -24,7 +24,7 @@
                         tol, QuadForm, verbose, nrvalpts, warn)
                         
 ### helper function to return the upper case solution if r=0
-.getUpperSol(L2deriv, b, radius, risk, neighbor, biastype,
+.getUpperSol(L2deriv, radius, risk, neighbor, biastype,
                        normtype, Distr, Finfo, trafo,
                        QuadForm, verbose, warn)