[Robast-commits] r38 - pkg/ROptEst/R

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

Author: stamats
Date: 2008-02-19 06:12:56 +0100 (Tue, 19 Feb 2008)
New Revision: 38

Modified:
   pkg/ROptEst/R/getInfRobIC_asGRisk.R
Log:
resolved conflict - no changes

Modified: pkg/ROptEst/R/getInfRobIC_asGRisk.R
===================================================================
--- pkg/ROptEst/R/getInfRobIC_asGRisk.R	2008-02-19 01:40:25 UTC (rev 37)
+++ pkg/ROptEst/R/getInfRobIC_asGRisk.R	2008-02-19 05:12:56 UTC (rev 38)
@@ -26,17 +26,17 @@
             S <- symm at SymmCenter == 0
         else
             S <- FALSE
-                
+
         repeat{
             iter <- iter + 1
             z.old <- z
             c0.old <- c0
             c0 <- try(uniroot(getInfClip, 
-        lower = .Machine$double.eps^0.75, 
-        upper = upper, 
 ## new
 #lower = getL1normL2deriv(L2deriv = L2deriv, cent = z)/ (1 + neighbor at radius^2), 
+                        lower = .Machine$double.eps^0.75, 
 #upper = sqrt( ( Finfo + z^2 )/(( 1 + neighbor at radius^2)^2 - 1) ), 
+                        upper = upper, 
 ##
                         tol = tol, L2deriv = L2deriv, risk = risk, 
                         neighbor = neighbor,  biastype = biastype,
@@ -67,7 +67,7 @@
             }
         }
         info <- paste("optimally robust IC for", sQuote(class(risk)[1]))
-        A <- getInfStand(L2deriv = L2deriv, neighbor = neighbor, 
+        A <- getInfStand(L2deriv = L2deriv, neighbor = neighbor,
                      biastype = biastype, clip = c0, cent = z, trafo = trafo)
         a <- as.vector(A)*z
         b <- abs(as.vector(A))*c0
@@ -76,7 +76,7 @@
                           trafo = trafo)
         Risk <- c(Risk, list(asBias = b))
 
-        return(list(A = A, a = a, b = b, d = NULL, risk = Risk, info = info))    
+        return(list(A = A, a = a, b = b, d = NULL, risk = Risk, info = info))
     })
 setMethod("getInfRobIC", signature(L2deriv = "RealRandVariable", 
                                    risk = "asGRisk", 
@@ -130,15 +130,12 @@
             b.old <- b
             A.old <- A
             b <- try(uniroot(getInfClip, 
-            
-        lower = .Machine$double.eps^0.75, 
-        upper = upper, 
 ## new
-#lower = getL1normL2deriv(L2deriv = L2deriv, cent = z, stand = A, 
-#                         Distr = Distr)/(1+neighbor at radius^2),
-#upper = sqrt( sum( diag(A%*%Finfo%*%t(A)) + (A%*%z)^2) / 
-#              ((1 + neighbor at radius^2)^2-1)),
-##                     
+#lower = getL1normL2deriv(L2deriv = L2deriv, cent = z, stand = A, Distr = Distr)/(1+neighbor at radius^2),
+#upper = sqrt( sum( diag(A%*%Finfo%*%t(A)) + (A%*%z)^2) / ((1 + neighbor at radius^2)^2-1)),
+                         lower = .Machine$double.eps^0.75, 
+                         upper = upper, 
+##
                          tol = tol, L2deriv = L2deriv, risk = risk, 
                          biastype = biastype, Distr = Distr, neighbor = neighbor, 
                          stand = A, cent = z, trafo = trafo)$root, silent = TRUE)